Merge branch 'platform_battery-2.6.34' into om-gta02-2.6.34
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 17 May 2010 23:04:36 +0000 (01:04 +0200)
committerLars-Peter Clausen <lars@metafoo.de>
Mon, 17 May 2010 23:04:36 +0000 (01:04 +0200)
commite23313fc76e2724fe56354526275458a0bdc10c3
tree49129c2092670f43a31c1f7ecc16d37ca9bc3ad4
parentcd3258c9d166f8c64a85b0cd2c0cd64342d69eb8
parent34e2f560d56dfdc069a8d4dab319e078806169b9
Merge branch 'platform_battery-2.6.34' into om-gta02-2.6.34

Conflicts:

drivers/power/Kconfig
drivers/power/Makefile
drivers/power/Kconfig
drivers/power/Makefile