]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit295b8d853c5df28fdb1fda93e44a8b941a601f20
tree2013405da9810dc4d9a5e77497f1afadb5b8d5d3
parent97724838ab0d21c67e3b6d0a6d3f92cf0fab29c8
parent416093f8afd5ab432412fb767e695506ef0b8a6d
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