Linux-omap rebuilt: for-next updated

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

To view the changes since the last rebuild, please do
$ git diff b954ec61815c8529a820cea2f93c5d12a9db364d..3255b2e7df2349a4d7b2a2a7cc47553096340cd4 arch/arm/*omap*/