$ git checkout -b tmp-rebuild-
1310544347 linus
$ git merge -m "Merge omap-fixes-for-linus board-part-2 tmp-merge fixes-part-2 twl-asoc omap-testing cbus" omap-fixes-for-linus board-part-2 tmp-merge fixes-part-2 twl-asoc omap-testing cbus
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.1/i2c-andy
$ git pull git://git.pwsan.com/linux-2.6 prcm-devel-3.1
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1310544347
To view the changes since the last rebuild, please do
$ git diff
620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc..
740341ea58f5abd2288fa04434cd6b3f63f1411f arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1310544347