Linux-omap rebuilt: Merge in cbus patches for testing

$ git checkout -b tmp-rebuild-1284681793 linus
$ git merge -m "Merge cbus" cbus
$ 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 -s ours master
$ git checkout master
$ git merge tmp-rebuild-1284681793

To view the changes since the last rebuild, please do
$ git diff da22d713d1149f528a734a10ea264c91a804662a..1ca306aa16c89967d088f3125123db946a9aeafa arch/arm/*omap*/