diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-21 17:20:20 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-21 17:20:20 +0100 |
commit | 270f524f6162b047846c6756a4a67ab902ecef46 (patch) | |
tree | 993c1ccfc5e8f018b8f649b05bcc9aa5661d67c5 /arch/arm/mach-omap1/pm.h | |
parent | 6d41420c8e96a708ee34d1f765e73c0483ac7a06 (diff) | |
parent | 0529d0a163400840d3edbabefb3d6e36c52fe52e (diff) | |
parent | 8529fc72ffafeef1f1da30a9df908d733f307c44 (diff) | |
parent | 91e891a0feb54bada927e9556cfa2dc7ced21489 (diff) | |
parent | 9489a6388658bb95634ad46a5d5647128b32b3f2 (diff) | |
parent | c973886130893c7a769a3bdbd625b6b4b9e72b27 (diff) | |
parent | 97207e0b1d7c340abd5ab20b1654d27c09599f4c (diff) |
Merge branches 'bq27000-2.6.32', 'glamo-2.6.32', 'jbt6k74-2.6.32', 'pcf50633-2.6.32', 'wm8753-2.6.32', 's3c-touchscreen-2.6.32' and 'om-s3c-2.6.32' into om-gta02-2.6.32