$ git checkout -b tmp-rebuild-
1309348313 linus
$ git merge -m "Merge devel-fixes devel-cleanup devel-board omap-testing cbus" devel-fixes devel-cleanup 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-
1309348313
To view the changes since the last rebuild, please do
$ git diff
1cb3266198df3b1e346f5433580895579a39bdae..
06e9a009c4cf73eb89fc50abe6a26ce9f04403fd arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1309348313