$ git checkout -b tmp-rebuild-
1323397337 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 -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1323397337
To view the changes since the last rebuild, please do
$ git diff
bbcefdf43ab82084c0d2c741a364bb9a554d4479..
82c4d8b7de31c676616ae267d6d1e1d8bd10695a arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1323397337