Merge branch 'staging-linus' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Sep 2012 18:58:26 +0000 (11:58 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Sep 2012 18:58:26 +0000 (11:58 -0700)
commitc283cf384a7debe3fa421c4f77a375e111e8fcb5
tree62fdb0bd65d11ee4820db5c2ebad17fd0984b4bb
parent0edc7d8381b1d9f9c15d1590b057e9160032603b
parent61ed59ed09e6ad2b8395178ea5ad5f653bba08e3
Merge branch 'staging-linus' into staging-next

Pick up 2 more comedi patches from Ian that are needed for other
changes in the future.

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