Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 07:21:02 +0000 (00:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 07:21:02 +0000 (00:21 -0700)
commit6d87f207c04370681b9a710b8dbed0f567491e49
treeb6ca4ab9f7358f2ec8088fbadcb5f078a9c022f2
parentd20de763548f9948f4534fc816155d8ee48e1d35
parentf6e6e7799ebcad40fa15e4015beca2d776554302
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:
  kobject_uevent: fix typo in comments
  firmware_class: fix typo in error path
  kobject: Break the kobject namespace defs into their own header