$ git checkout -b tmp-rebuild-
1286315758 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-hwmods
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1286315758
To view the changes since the last rebuild, please do
$ git diff
e1db73912a2f1855926a81394bfc8b987617c11e..
699447917fa0273fae9c1d2b74ca6cd8ee306b21 arch/arm/*omap*/