git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 8 Oct 2012 01:23:37 +0000 (12:23 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 8 Oct 2012 01:23:37 +0000 (12:23 +1100)
commit	78699773f701915df8431cf3b235624d10742963
tree	8fe3e1fe41f24a7d321b888e56b359d128937887	tree \| snapshot
parent	505ac96c4efe681ba470a70c6df0d38516e6b701	commit \| diff
parent	13b1ba7de8d0ecc42e4f9c002d5b0c1a48f05e58	commit \| diff

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

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/display.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/omap/omap_vout.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/displays/panel-taal.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dispc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/omapfb/omapfb-main.c	diff1 \|	diff2 \|	blob \| history