$ git checkout -b tmp-rebuild-
1286925117 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-
1286925117
To view the changes since the last rebuild, please do
$ git diff
99cf6302ebc2dd100dcbfd16e98bf57247036b6b..
7d222dbcaca1ea9bf66aa1cb157cce3935bff4ba arch/arm/*omap*/