Linux-omap rebuilt: Really merged in omap4, left out sparse fixes
authorTony Lindgren <tony@atomide.com>
Sat, 25 Sep 2010 00:15:21 +0000 (17:15 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 25 Sep 2010 00:15:21 +0000 (17:15 -0700)
$ git checkout -b tmp-rebuild-1285373681 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-1285373681

To view the changes since the last rebuild, please do
$ git diff 4d2acadf1d6e5469a5fc108bd50070dac7974d5e..e38df54473446ebb9bfa5f3c7ded45f427d69206 arch/arm/*omap*/


Trivial merge