$ git checkout -b tmp-rebuild-
1275313163 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-
1275313163
To view the changes since the last rebuild, please do
$ git diff
d8beeb76e8281f18a8b995d20ebe99004561c6ad..
488676e79118cbb2987bf6611c0694170ba72101 arch/arm/*omap*/