Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:36:31 +0000 (07:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:36:31 +0000 (07:36 -0800)
commitf8c7e6c2038a96f427911264a0c1448c9e3c2a9e
tree2013405da9810dc4d9a5e77497f1afadb5b8d5d3
parentc9140487b4601ea0b4479af3d92ceb0cda2c691f
parentbd796671f093d5b1841d383674d5650f5ec6c9c6
Merge git://git./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