Linux-omap rebuilt: omap for-next merged to mainline

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

To view the changes since the last rebuild, please do
$ git diff 2a20002a83ce565ed16aaec5e64151cae165cb8f..f1a4d096ab5f7973b4c5d989222455fc1dc6a52a arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1260323192