Linux-omap rebuilt: omap-fixes merged to mainline, merged in omap for-next
authorTony Lindgren <tony@atomide.com>
Fri, 2 Jul 2010 10:39:59 +0000 (13:39 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 2 Jul 2010 10:39:59 +0000 (13:39 +0300)
$ git checkout -b tmp-rebuild-1278067151 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-1278067151

To view the changes since the last rebuild, please do
$ git diff 44dc6ed4a147a62fb87b77e3c8c80880813b6742..b3df6517c693e7053960bc7d7944035cdb2bfb0c arch/arm/*omap*/


Trivial merge