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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 04:38:36 +0000 (14:38 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 04:38:36 +0000 (14:38 +1000)
commit	8f94278c08d06a1ceeb912c1d62922c1f30fff60
tree	1aaf673136ac7ac10b7307ad2187229f9ca91207	tree \| snapshot
parent	4ef490323758074e7372a9237e980760a30554b3	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/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