]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'omap_dss2/for-next'
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 16:04:34 +0000 (17:04 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 16:04:34 +0000 (17:04 +0100)
commit0ab35b1ff69507b71e0c5959cd53721b57962e5e
tree2e5c653602992c8a50b4238e0b6700cd30a60c50
parentcae0b5731b0488a71db950f8fae51bc793615bcc
parent718b90ac4c21c81f42b6db062ca0867f3cac7648
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
drivers/video/omap2/dss/hdmi4_core.c
drivers/video/omap2/dss/hdmi4_core.h
drivers/video/amba-clcd.c