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

Conflicts:
	drivers/power/wm97xx_battery.c

diff --cc drivers/input/touchscreen/wm97xx-core.c
Simple merge

diff --cc drivers/power/wm97xx_battery.c
index c552082,b787335..f2bfd29
--- 1/drivers/power/wm97xx_battery.c
--- 2/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@@ -33,20 -33,14 +33,20 @@@ static enum power_supply_property *prop
  
  static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
  {
-       return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
 +      struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
 +      struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 +
+       return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
                                        pdata->batt_aux) * pdata->batt_mult /
                                        pdata->batt_div;
  }
  
  static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)
  {
-       return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
 +      struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
 +      struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 +
+       return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
                                        pdata->temp_aux) * pdata->temp_mult /
                                        pdata->temp_div;
  }

diff --cc include/linux/wm97xx.h
Simple merge