Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:04:59 +0000 (14:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:04:59 +0000 (14:04 -0700)
commitd3de0eb1642feda3c53fb455e7cf07b222deafb5
treeee010c5fcbed7c42710e25ba1b7950b4c118f20a
parentb06ac5a3606d365a63e671273a441158ce3019bb
parent57f9bdac2510cd7fda58e4a111d250861eb1ebeb
Merge git://git./linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  sysfs: checking for NULL instead of ERR_PTR