Linux omap got rebuilt from scratch
authorTony Lindgren <tony@atomide.com>
Sat, 17 Oct 2009 00:11:19 +0000 (17:11 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 17 Oct 2009 00:11:19 +0000 (17:11 -0700)
$ git checkout -b tmp-rebuild-1255738174 linus
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge ehci" ehci
$ 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-1255738174

To view the changes since the last rebuild, please do
$ git diff 274c94b29ee7c53609a756acca974e4742c59559..9813a20643b37bb1b27bc4d312a48bf8c840776f arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1255738174


Trivial merge