Linux-omap rebuilt: Merged serial console fixes, cleanup
authorTony Lindgren <tony@atomide.com>
Thu, 25 Nov 2010 01:23:37 +0000 (17:23 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Nov 2010 01:23:37 +0000 (17:23 -0800)
$ git checkout -b tmp-rebuild-1290648207 linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1290648207

To view the changes since the last rebuild, please do
$ git diff 25f7615faa843731af4eda7d05077f1c5132e1a9..1d272df23eeccc4c5f23df0b2fd1a5876caab805 arch/arm/*omap*/


Trivial merge