]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jan 2011 00:10:33 +0000 (16:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jan 2011 00:10:33 +0000 (16:10 -0800)
commit009490f9005eb2bfaa50b1dc4c7eb9a42d97b4a8
tree27ace4446e42058ef4813a34bf63b55a870e7a12
parent2f37feba87a78f0401b0a9f9742e0626d20c1a8d
parenta5de39c7218043b59b9b0feaa8a550cb83f4fb95
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  driver core: Document that device_rename() is only for networking
  sysfs: remove useless test from sysfs_merge_group
  driver-core: merge private parts of class and bus
  driver core: fix whitespace in class_attr_string
drivers/base/core.c
include/linux/device.h