From: Tony Lindgren Date: Fri, 20 Apr 2012 00:47:43 +0000 (-0700) Subject: Linux-omap rebuilt: Rebuilt again, now with the right pending branches X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e32b7eeeb5d0ab28dd55a5b3be2d88409beffc8;p=pandora-kernel.git Linux-omap rebuilt: Rebuilt again, now with the right pending branches $ git checkout -b tmp-rebuild-1334882851 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-1334882851 To view the changes since the last rebuild, please do $ git diff 6bd61e8de0511dd9831eb9d89eea0b4603a10e9e..b094f8965159ab4edb3590bfd800ca30466b69de arch/arm/*omap*/ --- 1e32b7eeeb5d0ab28dd55a5b3be2d88409beffc8