]> 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>
Fri, 27 Sep 2013 05:49:46 +0000 (15:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Sep 2013 05:49:46 +0000 (15:49 +1000)
commit5094001bc464c12d3e04eb73a5e0d5e8436f09f7
tree0df4c3aea677d4e3d1ec64633670a5f3220a99f8
parent0ffd160d7fe1b9f9727eee46dc691a7251d9fe51
parent16bf90f13c969d01c17c034787e85baff5648c38
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
drivers/video/atmel_lcdfb.c
drivers/video/atmel_lcdfb.c