$ git checkout -b tmp-rebuild-
1286410261 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 for-next" for-next
$ git pull ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git pm-hwmod-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1286410261
To view the changes since the last rebuild, please do
$ git diff
3c037e41ff7f7356a23316dc5bf3dcef6d2dfac5..
cb5c3db11fe39f155d81239664f35ec1c852640e arch/arm/*omap*/