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