From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Jan 2011 00:10:33 +0000 (-0800)
Subject: Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.38-rc1~422
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e54be894eae10eca9892e965cc9532f5d5a11767;p=~shefty%2Frdma-dev.git

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

e54be894eae10eca9892e965cc9532f5d5a11767