Linux-omap rebuilt: Merged in some of the patches for the next merge window
authorTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 01:32:45 +0000 (18:32 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 01:32:45 +0000 (18:32 -0700)
$ git checkout -b tmp-rebuild-1285291919 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 merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1285291919

To view the changes since the last rebuild, please do
$ git diff ff85b57b1ae33601b8d595f9a775d4310aebbd78..b780366f67b258f7f8e0f413b383887d97f5db4c arch/arm/*omap*/


Trivial merge