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

$ git checkout -b tmp-rebuild-1299876152 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-1299876152

To view the changes since the last rebuild, please do
$ git diff d6f5a6e9f82825c55685b5d802eb4fecea14a951..25c48b93bdefb2673b4a712062bd5340f59dcf2f arch/arm/*omap*/