diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-10 13:45:26 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-10 13:45:26 +0100 |
| commit | 197a6fe1ccb99ba4b70ca4af07b528ff54db169a (patch) | |
| tree | 47f796eb990c7b269138856ca6d0a601d8cb30ef /arch/arm/tools/gen-mach-types | |
| parent | a03f58c61cb66164aa40cbf7bf3ff5f24a6f658b (diff) | |
| parent | 41eab7673f8c0de9fa6be7abec64df99ad13a86c (diff) | |
Merge branch 'platform_battery-2.6.31' into om-gta02-2.6.31
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'arch/arm/tools/gen-mach-types')
0 files changed, 0 insertions, 0 deletions