Merge branch 'mfd/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Mark Brown [Mon, 12 Dec 2011 16:19:20 +0000 (00:19 +0800)]
1  2 
MAINTAINERS
arch/arm/mach-shmobile/board-ap4evb.c
include/linux/mfd/wm8994/pdata.h
include/linux/mfd/wm8994/registers.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge