]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 02:16:03 +0000 (12:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 02:16:03 +0000 (12:16 +1000)
commit756650ad011ea6f8d0c4141da7cc707386d91d96
tree6be53fa1eaf149129f765cadacb7db2e87577674
parentfa1bf356334fb86741025d449e111ab00204a2a4
parentc64d0255cf9738441b9841ae674a888bea836b8d
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
12 files changed:
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-cm-t35.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-igep0020.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-omap4panda.c
arch/arm/mach-omap2/board-overo.c