Merge remote-tracking branch 'mfd/for-next'

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 arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mach-ux500/board-u5500.c
index fe1569b67c9182cea704dab1fc4ddd1145388dbe,4ecb07a93f145e9ca13329dbcd08c5b0a6e2b0a0..9de9e9c4dbbbcf2322e0fbaf3140537e31b89d4a
--- 1/arch/arm/mach-ux500/board-u5500.c
--- 2/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@@ -10,9 -10,8 +10,9 @@@
  #include <linux/amba/bus.h>
  #include <linux/irq.h>
  #include <linux/i2c.h>
- #include <linux/mfd/ab5500/ab5500.h>
+ #include <linux/mfd/abx500/ab5500.h>
  
 +#include <asm/hardware/gic.h>
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  

diff --cc drivers/input/misc/ab8500-ponkey.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/Makefile
Simple merge

diff --cc drivers/mfd/wm8994-core.c
Simple merge