Merge 3.9-rc7 into char-misc-next
Greg Kroah-Hartman [Mon, 15 Apr 2013 01:21:35 +0000 (18:21 -0700)]
We want the fixes in there.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1  2 
MAINTAINERS
sound/soc/codecs/wm5102.c

diff --cc MAINTAINERS
Simple merge
Simple merge