]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9971f0d 974a658)
Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:23:29 +0000 (11:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:23:29 +0000 (11:23 +1000)
Conflicts:
drivers/video/omap2/dss/core.c
drivers/video/omap2/dss/dispc.c


Trivial merge
Linux kernel for KaRo TX COM modules