From: Tony Lindgren <tony@atomide.com>
Date: Fri, 18 Oct 2013 18:22:55 +0000 (-0700)
Subject: Linux-omap rebuilt: Remerged pending branches after fixing board-removal branch
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c57155c8e9628a86e03edce8985be2ecdfa82ff0;p=pandora-kernel.git

Linux-omap rebuilt: Remerged pending branches after fixing board-removal branch

$ git checkout -b tmp-rebuild-1382120570 linus
$ git merge -m "Merge omap-for-v3.13/tmp-merge-take2" omap-for-v3.13/tmp-merge-take2
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1382120570

To view the changes since the last rebuild, please do
$ git diff 3808c0230949bee6e51ed7d9f017e2917b9dfc6e..e0a5b2957103b7a0c40da835f4aded2bb9add7d0 arch/arm/*omap*/
---

c57155c8e9628a86e03edce8985be2ecdfa82ff0
Reading git-diff-tree failed