$ git checkout -b tmp-rebuild-
1308735717 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-
1308735717
To view the changes since the last rebuild, please do
$ git diff
0a28368cceb11ab852f781e7c531e9c5ce9926c9..
969bb472157f9e3840fe670c9ce4f6426edf1126 arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1308735717