]> 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, 7 Sep 2012 03:28:58 +0000 (13:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 03:28:58 +0000 (13:28 +1000)
commit8539e739bccc1e64361083fa3dd4bb8e4938a713
tree9653479506fd00cf443febefc95387ceab1cf1a2
parent04299a9ac5efa0871f5bd1ca36f6bbee3ce926d9
parentc50e86ce7c2961a41f2f7aa6e4fd6c99229ba205
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
drivers/video/omap2/dss/sdi.c
drivers/video/omap2/dss/sdi.c