From: Tony Lindgren Date: Tue, 4 Oct 2011 16:21:28 +0000 (-0700) Subject: Linux-omap rebuilt: Remerged branches into dt-base because of duplicate merge X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e2564df31555377ee96e718d025d198035143ac;p=pandora-kernel.git Linux-omap rebuilt: Remerged branches into dt-base because of duplicate merge $ git checkout -b tmp-rebuild-1317745277 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-1317745277 To view the changes since the last rebuild, please do $ git diff 3f074538a586d997d138e2080acf2e2451f0f565..0cdbd17e9d60cf553a4c6c3e977dc655d2c46b91 arch/arm/*omap*/ Merge branch 'master' into tmp-rebuild-1317745277 --- 5e2564df31555377ee96e718d025d198035143ac