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