diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-08 00:17:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-08 00:17:52 +0100 |
| commit | 17cb3be61b45d716f6b21a9380925493413ce0ed (patch) | |
| tree | d29ca8bc010a22f358032346d7e7b6887c455e08 /usr | |
| parent | staging: android: Add some Kconfig help entries (diff) | |
| parent | staging: tidspbridge: use prepare/unprepare on dsp clocks (diff) | |
| download | linux-17cb3be61b45d716f6b21a9380925493413ce0ed.tar.xz linux-17cb3be61b45d716f6b21a9380925493413ce0ed.zip | |
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>
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions