Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/power/Makefile

diff --cc drivers/power/Kconfig
index ae095a498db4569f572a5acb843b2c4f059a9a33,63bb579104452f0c8228e7fbbf5bccedcb37f8f6..8e0c2b47803ce9f8b0670953eadefdc994ade68d
--- 1/drivers/power/Kconfig
--- 2/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -56,16 -56,10 +56,16 @@@ config BATTERY_TOS
          Say Y to enable support for the battery on the Sharp Zaurus
          SL-6000 (tosa) models.
  
- config BATTERY_PALMTX
-       tristate "Palm T|X battery"
-       depends on MACH_PALMTX
+ config BATTERY_WM97XX
+       bool "WM97xx generic battery driver"
+       depends on TOUCHSCREEN_WM97XX=y
        help
-         Say Y to enable support for the battery in Palm T|X.
+         Say Y to enable support for battery measured by WM97xx aux port.
  
 +config BATTERY_BQ27x00
 +      tristate "BQ27200 battery driver"
 +      depends on I2C
 +      help
 +        Say Y here to enable support for batteries with BQ27200(I2C) chip.
 +
  endif # POWER_SUPPLY

diff --cc drivers/power/Makefile
index 6cb301b779a79eebe7be6c993c60dab53bcee717,4e20026cc45aaa39550340526dc51ae66c35369e..e8f1ecec5d8fd2f5467ec1111061a96f0a1420d7
--- 1/drivers/power/Makefile
--- 2/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@@ -21,5 -21,4 +21,5 @@@ obj-$(CONFIG_BATTERY_DS2760)  += ds2760_
  obj-$(CONFIG_BATTERY_PMU)     += pmu_battery.o
  obj-$(CONFIG_BATTERY_OLPC)    += olpc_battery.o
  obj-$(CONFIG_BATTERY_TOSA)    += tosa_battery.o
- obj-$(CONFIG_BATTERY_PALMTX)  += palmtx_battery.o
 -obj-$(CONFIG_BATTERY_WM97XX)  += wm97xx_battery.o
++obj-$(CONFIG_BATTERY_WM97XX)  += wm97xx_battery.o
 +obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o

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