| commit | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 23:17:39 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 23:17:39 2011 +0100 |
| tree | 0fb4dba7b72d28e1dc4d3bab1317a9a98302a7a5 | |
| parent | d6bb0f27709b91e674ce1441e2dd5e68620edf14 [diff] | |
| parent | 3e28189038bb831512cf4f8313e1aead97c3e63f [diff] |
Merge branch 'depends/omap2_dss' into next/cleanup Omap cleanups conflicted with omap2_dss work in a nontrivial way, this is the most logical fixup. Conflicts: arch/arm/mach-omap2/board-2430sdp.c arch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-apollon.c arch/arm/mach-omap2/board-h4.c arch/arm/mach-omap2/board-ldp.c arch/arm/mach-omap2/board-rx51.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>