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