$ git checkout -b tmp-rebuild-
1274834331 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-
1274834331
To view the changes since the last rebuild, please do
$ git diff
7b93a0d31f28bd6e531bae7f59716a04d943fe8d..
7325a5a9333a354a7706948f2e324bfd8eb87d50 arch/arm/*omap*/