$ git checkout -b tmp-rebuild-
1274224989 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-
1274224989
To view the changes since the last rebuild, please do
$ git diff
20124b7d7059db9e9bab78965f6feb6bbe13f5a4..
af52532b7640e02c30c69affce2eccface82048c arch/arm/*omap*/