Merge 3.6-rc7 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Sep 2012 23:51:27 +0000 (16:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Sep 2012 23:51:27 +0000 (16:51 -0700)
This pulls in the fixes in that branch that are needed here as well.

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

diff --cc MAINTAINERS
Simple merge
Simple merge