Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile

diff --combined drivers/power/Kconfig
index e3a9c37,4d17d38..9ce5585
--- 1/drivers/power/Kconfig
--- 2/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -49,11 -49,10 +49,17 @@@ config BATTERY_OLP
        help
          Say Y to enable support for the battery on the OLPC laptop.
  
 +config BATTERY_TOSA
 +      tristate "Sharp SL-6000 (tosa) battery"
 +      depends on MACH_TOSA && MFD_TC6393XB
 +      help
 +        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
+       help
+         Say Y to enable support for the battery in Palm T|X.
+ 
  endif # POWER_SUPPLY

diff --combined drivers/power/Makefile
index 1e408fa,6f43a54..4706bf8
--- 1/drivers/power/Makefile
--- 2/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@@ -20,4 -20,4 +20,5 @@@ obj-$(CONFIG_APM_POWER)               += apm_power.
  obj-$(CONFIG_BATTERY_DS2760)  += ds2760_battery.o
  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

diff --combined drivers/power/power_supply_sysfs.c
index 82e1246,49215da..fe2aeb1
--- 1/drivers/power/power_supply_sysfs.c
--- 2/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@@ -99,7 -99,6 +99,7 @@@ static struct device_attribute power_su
        POWER_SUPPLY_ATTR(charge_empty),
        POWER_SUPPLY_ATTR(charge_now),
        POWER_SUPPLY_ATTR(charge_avg),
 +      POWER_SUPPLY_ATTR(charge_counter),
        POWER_SUPPLY_ATTR(energy_full_design),
        POWER_SUPPLY_ATTR(energy_empty_design),
        POWER_SUPPLY_ATTR(energy_full),
@@@ -202,7 -201,7 +202,7 @@@ int power_supply_uevent(struct device *
  
        dev_dbg(dev, "uevent\n");
  
-       if (!psy) {
+       if (!psy || !psy->dev) {
                dev_dbg(dev, "No power supply yet\n");
                return ret;
        }