Linux-omap rebuilt: DSS2 merged to mainline, omap-for-linus updated

$ git checkout -b tmp-rebuild-1260579099 linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge omap-for-linus" omap-for-linus
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1260579099

To view the changes since the last rebuild, please do
$ git diff cff5d25561234148cbf2c5f133418eefeb131e78..0f85dc0a72fba849b271ef94b8586179faa56bdb arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1260579099