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