$ git checkout -b tmp-rebuild-
1274316083 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-
1274316083
To view the changes since the last rebuild, please do
$ git diff
1674c0ceabfb7726246989874bb4da7bcb55ea89..
cf2b84d821bbad2ac4fe4d4c84f437a83d24fb8b arch/arm/*omap*/