Merge commit 'refs/next/20111219/mfd'

diff --cc arch/arm/mach-sa1100/assabet.c
Simple merge

diff --cc arch/arm/mach-sa1100/cerf.c
Simple merge

diff --cc arch/arm/mach-sa1100/collie.c
Simple merge

diff --cc arch/arm/mach-sa1100/generic.c
Simple merge

diff --cc arch/arm/mach-sa1100/lart.c
Simple merge

diff --cc arch/arm/mach-sa1100/shannon.c
Simple merge

diff --cc arch/arm/mach-sa1100/simpad.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge