Linux-omap rebuilt:

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

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