Merge v3.5-rc5 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Jul 2012 15:25:34 +0000 (08:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Jul 2012 15:25:34 +0000 (08:25 -0700)
This picks up the big printk fixes, and resolves a merge issue with:
drivers/extcon/extcon_gpio.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/base/dd.c
drivers/extcon/extcon_class.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge