$ git checkout -b tmp-rebuild-
1273532159 linus
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge i2c-omap-for-ben" i2c-omap-for-ben
$ git merge -m "Merge for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1273532159
To view the changes since the last rebuild, please do
$ git diff
e1fc6fa71b54fa05505127690a1f176205986fe5..
d087ab1e34bec9920e814a673c02d7039cb0554e arch/arm/*omap*/