| commit | aee9a50c5b9e424994a58b2aefaa499623e6786a | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Jun 20 17:35:16 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Jun 20 17:35:16 2013 +0200 |
| tree | bb4b4b1664fa45d4823778efa57bf677b378837c | |
| parent | 58eb042889ddc8035ddb68a9c9cbd2251d1b7feb [diff] | |
| parent | 8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54 [diff] |
Merge branch 'omap/pm-voltdomain-cleanup' into next/soc Conflicts: arch/arm/mach-omap2/Makefile arch/arm/mach-omap2/io.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>