$ git checkout -b tmp-rebuild-
1276704487 linus
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge i2c-omap-for-ben" i2c-omap-for-ben
$ git merge -m "Merge for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1276704487
To view the changes since the last rebuild, please do
$ git diff
ebced05f3ca619ba181ca0608b501580fa404e83..
a391dda8993fecc7234af4bfbc81a0706d9db646 arch/arm/*omap*/