]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 02:07:54 +0000 (13:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 02:07:54 +0000 (13:07 +1100)
commite9c9db9f0684398436822a76bba40c8e64963bc1
tree77a3a97d571939b57eda7d706269fd995a28e972
parentfb0c57cb70b0e087698b5057b009d94b6b0f2783
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