Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500

Pull a huge ab8500/pm2301 pile of changes from Lee Jones. Lee did an
awesome job cleaning this stuff up and thus brought ab8500 Stericsson's
development tree much closer to the mainline. Even more changes to come,
though.

Conflicts:
	drivers/power/Kconfig

diff --cc drivers/power/Kconfig
index 1ae51551c9ffedaba8dec1d8723f59a668afb76a,4811b59ba730fa3270a9055ee2a24d3be8b6a5b7..1e4719790a94b613e7d132fb49b2a30a35908d8a
--- 1/drivers/power/Kconfig
--- 2/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -346,12 -346,13 +346,19 @@@ config AB8500_B
        help
          Say Y to include support for AB8500 battery management.
  
 +config BATTERY_GOLDFISH
 +      tristate "Goldfish battery driver"
 +      help
 +        Say Y to enable support for the battery and AC power in the
 +        Goldfish emulator.
 +
+ config CHARGER_PM2301
+       bool "PM2301 Battery Charger Driver"
+       depends on AB8500_BM
+       help
+         Say Y to include support for PM2301 charger driver.
+         Depends on AB8500 battery management core.
+ 
  source "drivers/power/reset/Kconfig"
  
  endif # POWER_SUPPLY

diff --cc drivers/power/Makefile
Simple merge

diff --cc drivers/power/ab8500_btemp.c
Simple merge