From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Aug 2010 07:21:02 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
X-Git-Tag: v2.6.36-rc3~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d87f207c04370681b9a710b8dbed0f567491e49;p=pandora-kernel.git

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

6d87f207c04370681b9a710b8dbed0f567491e49