$ git checkout -b tmp-rebuild-
1273623959 linus
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git gpio-2.6.35
$ 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-
1273623959
To view the changes since the last rebuild, please do
$ git diff
1783bc459c9df30cf6af0070605ddec5352fa11d..
f9f3b1f7197aa239bd5975b073e809ce02df33ac arch/arm/*omap*/