$ git checkout -b tmp-rebuild-
1323466941 linus
$ git merge -m "Merge fixes fixes-non-critical cleanup dt soc omap1 omap4 board driver testing-board testing-misc cbus" fixes fixes-non-critical cleanup dt soc omap1 omap4 board driver testing-board testing-misc cbus
$ git merge -m "Merge fixes fixes-non-critical cleanup dt soc omap1 omap4 board hsmmc testing-board testing-misc cbus" fixes fixes-non-critical cleanup dt soc omap1 omap4 board hsmmc testing-board testing-misc cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1323466941
To view the changes since the last rebuild, please do
$ git diff
80d7a568d291153330d34ecea1c9eb5eb2c9e3b4..
787808de88bb2a7197ae97861c1e7803ceffcf69 arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1323466941