]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'depends/omap2_dss' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:17:39 +0000 (23:17 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:17:39 +0000 (23:17 +0100)
commit034ee299122c6b145d6d3cafb9ef5c329a4ab990
tree0fb4dba7b72d28e1dc4d3bab1317a9a98302a7a5
parentd6bb0f27709b91e674ce1441e2dd5e68620edf14
parent3e28189038bb831512cf4f8313e1aead97c3e63f
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>
20 files changed:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/display.c
drivers/media/video/omap/omap_vout.c