tree b6ca4ab9f7358f2ec8088fbadcb5f078a9c022f2
parent d20de763548f9948f4534fc816155d8ee48e1d35
parent f6e6e7799ebcad40fa15e4015beca2d776554302
author Linus Torvalds <torvalds@linux-foundation.org> 1282634462 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282634462 -0700

Merge git://git.kernel.org/pub/scm/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