Linux-omap rebuilt: Merged updated for-next branches
authorTony Lindgren <tony@atomide.com>
Tue, 5 Oct 2010 01:51:54 +0000 (18:51 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Oct 2010 01:51:54 +0000 (18:51 -0700)
$ git checkout -b tmp-rebuild-1286243480 linus
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git pull ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git pm-hwmods
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1286243480

To view the changes since the last rebuild, please do
$ git diff 0882b1455797b0a104978000a622c3f2412e7cf5..de28b66e667c0df66c536ac2ce773cafb93878ef arch/arm/*omap*/


Trivial merge