Linux-omap rebuilt: Merged in branches from Kevin, Paul & Santosh

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

To view the changes since the last rebuild, please do
$ git diff a69f381cfcd6c5c224019ad2e9e942a4a99825e4..e40a06855e55f8e704f566bd293785b73c20ed8f arch/arm/*omap*/