From: Tony Lindgren Date: Fri, 20 Apr 2012 00:21:23 +0000 (-0700) Subject: Linux-omap rebuilt: Rebuilt tmp-merge with the pending branches X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bd61e8de0511dd9831eb9d89eea0b4603a10e9e;p=pandora-kernel.git Linux-omap rebuilt: Rebuilt tmp-merge with the pending branches $ git checkout -b tmp-rebuild-1334881269 linus $ git merge -m "Merge fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus" fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus $ git merge -s ours master $ git checkout master $ git merge tmp-rebuild-1334881269 To view the changes since the last rebuild, please do $ git diff 677b962f844a8d07d64dabd30c208e96fc22dea2..1ce594b875fd71cd67a378994f4eec970adc0621 arch/arm/*omap*/ --- 6bd61e8de0511dd9831eb9d89eea0b4603a10e9e Reading git-diff-tree failed