Merge remote-tracking branch 'battery/master'

Conflicts:
	include/linux/mfd/abx500/ab8500.h

diff --cc MAINTAINERS
Simple merge

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

diff --cc include/linux/mfd/abx500.h
Simple merge

diff --cc include/linux/mfd/abx500/ab8500.h
index fa7173dd71f20bf88e889acafc200c8a6334d599,b9a6a847ff6190b6d8dc32439e6fd9ec64aea04a..7c0df91e33783114b47c6f7d224cd80a619f19dd
--- 1/include/linux/mfd/abx500/ab8500.h
--- 2/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@@ -345,12 -346,23 +350,32 @@@ static inline int is_ab8500_2p0(struct 
        return (is_ab8500(ab) && (ab->chip_id == AB8500_CUT2P0));
  }
  
+ static inline int is_ab8505_1p0_or_earlier(struct ab8500 *ab)
+ {
+       return (is_ab8505(ab) && (ab->chip_id <= AB8500_CUT1P0));
+ }
+ 
+ static inline int is_ab8505_2p0(struct ab8500 *ab)
+ {
+       return (is_ab8505(ab) && (ab->chip_id == AB8500_CUT2P0));
+ }
+ 
+ static inline int is_ab9540_1p0_or_earlier(struct ab8500 *ab)
+ {
+       return (is_ab9540(ab) && (ab->chip_id <= AB8500_CUT1P0));
+ }
+ 
+ static inline int is_ab9540_2p0(struct ab8500 *ab)
+ {
+       return (is_ab9540(ab) && (ab->chip_id == AB8500_CUT2P0));
+ }
++
 +#ifdef CONFIG_AB8500_DEBUG
 +void ab8500_dump_all_banks(struct device *dev);
 +void ab8500_debug_register_interrupt(int line);
 +#else
 +static inline void ab8500_dump_all_banks(struct device *dev) {}
 +static inline void ab8500_debug_register_interrupt(int line) {}
 +#endif
 +
  #endif /* MFD_AB8500_H */