summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 07:36:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 07:36:31 -0800
commitf8c7e6c2038a96f427911264a0c1448c9e3c2a9e (patch)
tree2013405da9810dc4d9a5e77497f1afadb5b8d5d3 /drivers/staging/comedi
parentc9140487b4601ea0b4479af3d92ceb0cda2c691f (diff)
parentbd796671f093d5b1841d383674d5650f5ec6c9c6 (diff)
downloadblackbird-obmc-linux-f8c7e6c2038a96f427911264a0c1448c9e3c2a9e.tar.gz
blackbird-obmc-linux-f8c7e6c2038a96f427911264a0c1448c9e3c2a9e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: Revert "sysdev: fix prototype for memory_sysdev_class show/store functions" driver-core: fix devtmpfs crash on s390
Diffstat (limited to 'drivers/staging/comedi')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud