]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Sep 2012 21:53:22 +0000 (14:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Sep 2012 21:53:22 +0000 (14:53 -0700)
commit0462bfc88d37ecb7f69488643c91cb657a1f264d
tree0f307e998ca28deec27f8ed3e25098c86ef9545c
parent55815f70147dcfa3ead5738fd56d3574e2e3c1c2
parent60e233a56609fd963c59e99bd75c663d63fa91b6
Merge tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/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()"