diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-17 17:50:13 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-17 17:50:13 +0200 |
| commit | cf0f0ec16d3b21969f7a468cb1f9a97f94236d01 (patch) | |
| tree | 96e2fef6eb1899643e1ba6d9b1f6f59f0784d287 /arch/arm/mach-versatile/include | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
| parent | 7319a99ed3faebd022c4912884415c2ed087bce8 (diff) | |
| parent | a5d2b5ecd04068d2345296613f99c80dedd24dbb (diff) | |
Merge branches 'om-gta02-2.6.31' and 'om-gta01-2.6.31' into om-2.6.31
Conflicts:
drivers/mfd/Kconfig
drivers/power/Kconfig
drivers/power/Makefile