Merge 3.6-rc3 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 14:08:39 +0000 (07:08 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 14:08:39 +0000 (07:08 -0700)
commit9db48aaf18d675ac41f550c9384154e0c00de2ef
tree70a19b9164c103e5f52dddff609e01672f8ef616
parent0592969e73ae50ce6852d1aff3d222a335289094
parentfea7a08acb13524b47711625eebea40a0ede69a0
Merge 3.6-rc3 into driver-core-next

This picks up the printk fixes in 3.6-rc3 that are needed in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/core.c
drivers/extcon/extcon-gpio.c