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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc include/linux/mfd/abx500/ab8500.h
index b5780fd40fe4d8eff0571cf75d22b71c974c50f6,84f449475c255330ae73bb14482c308873afe802..fb1bf7d6a41018edf8358c76ffce8b74e2282cba
--- 1/include/linux/mfd/abx500/ab8500.h
--- 2/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@@ -362,11 -362,9 +362,10 @@@ struct ab8500 
        u8 *oldmask;
        int mask_size;
        const int *irq_reg_offset;
 +      int it_latchhier_num;
  };
  
- struct regulator_reg_init;
- struct regulator_init_data;
+ struct ab8500_regulator_platform_data;
  struct ab8500_gpio_platform_data;
  struct ab8500_codec_platform_data;
  struct ab8500_sysctrl_platform_data;