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

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


Trivial merge