Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Feb 2010 00:55:13 +0000 (16:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Feb 2010 00:55:13 +0000 (16:55 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  class: Free the class private data in class_release
  sysfs: sysfs_sd_setattr set iattrs unconditionally


Trivial merge