From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Jan 2013 23:17:52 +0000 (-0800)
Subject: Merge branch 'staging-linus' into staging-next
X-Git-Tag: v3.9-rc1~127^2~495
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17cb3be61b45d716f6b21a9380925493413ce0ed;p=pandora-kernel.git

Merge branch 'staging-linus' into staging-next

This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.

It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

17cb3be61b45d716f6b21a9380925493413ce0ed
Reading git-diff-tree failed