From: Tony Lindgren Date: Tue, 4 Oct 2011 21:13:28 +0000 (-0700) Subject: Linux-omap rebuilt: Merged rebuilt dt-base and dt one more time to avoid duplicate... X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ed934ee5c306540e6d0f3e0ce6ed8a8d27c947;p=pandora-kernel.git Linux-omap rebuilt: Merged rebuilt dt-base and dt one more time to avoid duplicate commits $ git checkout -b tmp-rebuild-1317762795 linus $ git merge -m "Merge dt-merge board testing-board cbus" dt-merge board testing-board cbus $ git merge -s ours master $ git checkout master $ git merge tmp-rebuild-1317762795 To view the changes since the last rebuild, please do $ git diff 5e2564df31555377ee96e718d025d198035143ac..1904e448e9c809e5821a8d68cef33d821085ee8d arch/arm/*omap*/ Merge branch 'master' into tmp-rebuild-1317762795 --- c3ed934ee5c306540e6d0f3e0ce6ed8a8d27c947 Reading git-diff-tree failed