$ git checkout -b tmp-rebuild-
1323732919 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 musb testing-board testing-misc cbus" fixes fixes-non-critical cleanup dt soc omap1 omap4 board hsmmc musb testing-board testing-misc cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1323732919
To view the changes since the last rebuild, please do
$ git diff
4cd3aeff338c57c5ebc191243116a94e532ec261..
f48e573bcc751d51c6f5dd932abcda7a452810e6 arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1323732919