$ git checkout -b tmp-rebuild-
1328812666 linus
$ git merge -m "Merge fixes fixes-non-critical cleanup soc hwmod pm dt omap1 omap4 driver i2c board testing-board testing-misc cbus" fixes fixes-non-critical cleanup soc hwmod pm dt omap1 omap4 driver i2c board testing-board testing-misc cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1328812666
To view the changes since the last rebuild, please do
$ git diff
1c6ece3c23e58d0dbc687407d606f3560ded582a..
a63abd0cc30e667dea2292760bf6066cc2fe333a arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1328812666