From: Tony Lindgren Date: Tue, 20 May 2014 00:38:58 +0000 (-0700) Subject: Linux-omap rebuilt: Updated with pending branches for v3.16 merge window X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b882a26e396cf76f7b173eb82bdb5dde1dfe46e;p=pandora-kernel.git Linux-omap rebuilt: Updated with pending branches for v3.16 merge window $ git checkout -b tmp-rebuild-1400546331 linus $ git merge -m "Merge omap-for-v3.16/tmp-merge-2014-05-19" omap-for-v3.16/tmp-merge-2014-05-19 $ git merge -s ours master $ git checkout master $ git merge tmp-rebuild-1400546331 To view the changes since the last rebuild, please do $ git diff 7f449094241c2fae88c78f0c6db528233ec1fca0..35567d93640cfb31f6dbaf5375c59fe91acb785f arch/arm/*omap*/ --- 8b882a26e396cf76f7b173eb82bdb5dde1dfe46e Reading git-diff-tree failed