From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Sep 2012 21:53:22 +0000 (-0700)
Subject: Merge tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc6~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0462bfc88d37ecb7f69488643c91cb657a1f264d;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge tag 'driver-core-3.6-rc6' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core fix from Greg Kroah-Hartman:
 "Here is one fix for 3.6-rc6 for the kobject.h file.

  It fixes a reported oops if CONFIG_HOTPLUG is disabled.  It's been in
  the linux-next tree for a while now.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"
---

0462bfc88d37ecb7f69488643c91cb657a1f264d