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