tree 27ace4446e42058ef4813a34bf63b55a870e7a12
parent 949f6711b83d2809d1ccb9d830155a65fdacdff9
parent c6c0ac664c86ff6408fadbed4913938c8a732e26
author Linus Torvalds <torvalds@linux-foundation.org> 1294704633 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294704633 -0800

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