Merge tag 'driver-core-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Oct 2013 17:39:01 +0000 (10:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Oct 2013 17:39:01 +0000 (10:39 -0700)
commit83f11a9cf2578b104c0daf18fc9c7d33c3d6d53a
tree4b884381e2686db8e0b33a6b17cdbc5af7c0a12c
parent02a3250fd39e3ad7568acc296e8d4d2d265c3def
parenta37f86305c80f441b8b99dae7c19d3f9d2effc15
Merge tag 'driver-core-3.12-rc6' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core fix from Greg KH:
 "Here is one fix for the hotplug memory path that resolves a regression
  when removing memory that showed up in 3.12-rc1"

* tag 'driver-core-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: Release device_hotplug_lock when store_mem_state returns EINVAL