aboutsummaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-05-18 01:04:36 +0200
committerLars-Peter Clausen <lars@metafoo.de>2010-05-18 01:04:36 +0200
commite23313fc76e2724fe56354526275458a0bdc10c3 (patch)
tree49129c2092670f43a31c1f7ecc16d37ca9bc3ad4 /samples
parentcd3258c9d166f8c64a85b0cd2c0cd64342d69eb8 (diff)
parent34e2f560d56dfdc069a8d4dab319e078806169b9 (diff)
Merge branch 'platform_battery-2.6.34' into om-gta02-2.6.34
Conflicts: drivers/power/Kconfig drivers/power/Makefile
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions