]> 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>
Mon, 8 Oct 2012 01:23:37 +0000 (12:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:23:37 +0000 (12:23 +1100)
commit78699773f701915df8431cf3b235624d10742963
tree8fe3e1fe41f24a7d321b888e56b359d128937887
parent505ac96c4efe681ba470a70c6df0d38516e6b701
parent13b1ba7de8d0ecc42e4f9c002d5b0c1a48f05e58
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap2/displays/panel-taal.c
drivers/video/omap2/dss/dispc.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/display.c
arch/arm/mach-omap2/twl-common.c
drivers/media/platform/omap/omap_vout.c
drivers/staging/omapdrm/omap_drv.c
drivers/video/omap2/displays/panel-taal.c
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/dsi.c
drivers/video/omap2/omapfb/omapfb-main.c