Linux-omap rebuilt: Merged in the smp-on-up patches for testing
authorTony Lindgren <tony@atomide.com>
Mon, 20 Sep 2010 22:14:25 +0000 (15:14 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Sep 2010 22:14:25 +0000 (15:14 -0700)
$ git checkout -b tmp-rebuild-1285020820 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-1285020820

To view the changes since the last rebuild, please do
$ git diff 0cbe681640a758def3db2fedf8e62e4f1c13e31b..96542e6e9d6f3d32bf95bf1ff50f4632aa5e57b5 arch/arm/*omap*/


Trivial merge