]> 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>
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)
commit76982ef2e2c24fc5b978fbb23504a3f5c71c52f0
tree64e652c9635a74c456b87646de438b78d271d2bc
parent9971f0dcbf0e3e83edf5fc87b06db71728f67760
parent974a65825e0b5fbda49605f0416a2c975d66e9e6
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
drivers/video/omap2/dss/core.c
drivers/video/omap2/dss/dispc.c