$ git checkout -b tmp-rebuild-
1324342225 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-hwmod fixes-non-critical fixes-non-critical-part2 hwmod hwmod-part2 tmp-merge hsmmc musb ehci i2c testing-board testing-misc cbus" fixes fixes-hwmod fixes-non-critical fixes-non-critical-part2 hwmod hwmod-part2 tmp-merge hsmmc musb ehci i2c testing-board testing-misc cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1324342225
To view the changes since the last rebuild, please do
$ git diff
a55802d5b060d8fa3c20da3649c1df20156b2ba0..
08b57666cba3921ea792d6557195025c86d6e4c9 arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1324342225