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)
commit6fbfd0592ef88ba29cdce84ef92757351f1fa9c9
tree7c0af4bcc08f3ad7befb93d73d9729f82252c950
parentf2c32a882d2c1cde6fc552a5a3d34b4c1330edb8
parent6887a4131da3adaab011613776d865f4bcfb5678
Merge v3.5-rc5 into driver-core-next

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>
MAINTAINERS
drivers/base/dd.c
drivers/extcon/extcon_class.c