Linux-omap rebuilt: Updated fixes

$ git checkout -b tmp-rebuild-1306929008 linus
$ git merge -m "Merge devel-fixes devel-board omap-testing cbus testing-i2c" devel-fixes devel-board omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1306929008

To view the changes since the last rebuild, please do
$ git diff 6dc050b68cbbd7ae4429e69f6034c0c32d7a6437..3d9d52c7c02b70da7a9aa36edbd0059bb7093f76 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1306929008