Linux-omap rebuilt: Updated fixes and cleanup

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

To view the changes since the last rebuild, please do
$ git diff 5b698d68c1a9ebeae76a0e4ca4dbfdb10357143d..a6f30321d0956dd2e60187d38612c89fb98ed5f7 arch/arm/*omap*/