Linux-omap rebuilt: Updated to -rc6, merged in pending stuff
authorTony Lindgren <tony@atomide.com>
Tue, 9 Apr 2013 03:15:21 +0000 (20:15 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 9 Apr 2013 03:15:21 +0000 (20:15 -0700)
$ git checkout -b tmp-rebuild-1365477315 linus
$ git merge -m "Merge omap-for-v3.9/tmp-merge" omap-for-v3.9/tmp-merge
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1365477315

To view the changes since the last rebuild, please do
$ git diff 658a876e5e87a2ef534cf3f142b88c641a0c286e..31880c37c11e28cb81c70757e38392b42e695dc6 arch/arm/*omap*/


Trivial merge