Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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

diff --cc drivers/base/core.c
Simple merge

diff --cc include/linux/device.h
Simple merge