$ git checkout -b tmp-rebuild-
1287172019 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-
1287172019
To view the changes since the last rebuild, please do
$ git diff
67572a62f10351528af72a6ae41129b68aacf1f3..
e4f261312088a553cdfb03f38ff78b6332f46e3e arch/arm/*omap*/