From: Tony Lindgren Date: Mon, 7 Nov 2011 20:36:01 +0000 (-0800) Subject: Linux-omap rebuilt: Updated fixes for modsplit merge X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=304f86148f9bd9bbdb6d4eb82952d39e6bab37eb;p=pandora-kernel.git Linux-omap rebuilt: Updated fixes for modsplit merge $ git checkout -b tmp-rebuild-1320698137 linus $ git merge -m "Merge fixes testing-misc cleanup dt soc board testing-board cbus" fixes testing-misc cleanup dt soc board testing-board cbus $ git merge -s ours master $ git checkout master $ git merge tmp-rebuild-1320698137 To view the changes since the last rebuild, please do $ git diff e329834e450d1fe89975f54d0eb421951425761c..95d70ea90b23e4798ba0e7b8826e7d9cd7c65032 arch/arm/*omap*/ Merge branch 'master' into tmp-rebuild-1320698137 --- 304f86148f9bd9bbdb6d4eb82952d39e6bab37eb Reading git-diff-tree failed