$ git checkout -b tmp-rebuild-
1272936135 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-
1272936135
To view the changes since the last rebuild, please do
$ git diff
104a77440f05430f29f9d3f4ecb88c1536819585..
5885c61c47f8e2cc8811a108f810276c8a29816b arch/arm/*omap*/