From: Tony Lindgren Date: Fri, 17 Sep 2010 00:03:48 +0000 (-0700) Subject: Linux-omap rebuilt: Merge in cbus patches for testing X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cbe681640a758def3db2fedf8e62e4f1c13e31b;p=pandora-kernel.git Linux-omap rebuilt: Merge in cbus patches for testing $ git checkout -b tmp-rebuild-1284681793 linus $ git merge -m "Merge cbus" cbus $ 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-1284681793 To view the changes since the last rebuild, please do $ git diff da22d713d1149f528a734a10ea264c91a804662a..1ca306aa16c89967d088f3125123db946a9aeafa arch/arm/*omap*/ --- 0cbe681640a758def3db2fedf8e62e4f1c13e31b Reading git-diff-tree failed