$ git checkout -b tmp-rebuild-
1308056395 linus
$ git merge -m "Merge devel-fixes devel-board omap-testing cbus" devel-fixes devel-board omap-testing cbus
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.g for_3.1/i2c-andy
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1308056395
To view the changes since the last rebuild, please do
$ git diff
ae9b25980183c65381839ed6e547c8137e06fb79..
ed24cb20db8eb846c8df7dc2303dbd2ce9d107e3 arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1308056395