From: Tony Lindgren Date: Fri, 16 Oct 2009 01:18:25 +0000 (-0700) Subject: Linux omap got rebuilt from scratch X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=274c94b29ee7c53609a756acca974e4742c59559;p=pandora-kernel.git Linux omap got rebuilt from scratch $ git checkout -b tmp-rebuild-1255655897 linus $ git merge -m "Merge cbus" cbus $ git merge -m "Merge ehci" ehci $ git merge -m "Merge omap-fixes" omap-fixes $ git merge -m "Merge omap-testing" omap-testing $ git merge -m "Merge for-next" for-next $ git merge -s ours master $ git checkout master $ git merge tmp-rebuild-1255655897 To view the changes since the last rebuild, please do $ git diff f856f168bcbc5f49253dd12a4d8452857a785f1c..f9535282ad25a1f823bf2688df491d1dedc73939 arch/arm/*omap*/ Merge branch 'master' into tmp-rebuild-1255655897 --- 274c94b29ee7c53609a756acca974e4742c59559 Reading git-diff-tree failed