Linux-omap rebuilt: for-next compile fixes

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

To view the changes since the last rebuild, please do
$ git diff 75d4409e2a1f4a5f2692cdb81f5755db8c4299b9..998eb505b09e0e09931dc5fd48d5e2ef8acb361c arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1258163727