$ git checkout -b tmp-rebuild-
1275912471 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-
1275912471
To view the changes since the last rebuild, please do
$ git diff
15ed0a21e1e4f7066d9d31db29331f6755bb42ee..
e08216d1f6bfef7d6a414420fbad8d71c705bd29 arch/arm/*omap*/