From: Paul Mundt Date: Fri, 16 Oct 2009 06:14:50 +0000 (+0900) Subject: Merge branch 'sh/stable-updates' X-Git-Tag: v2.6.33-rc1~347^2~27^2~77 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abeaf33a4101764291ec79cf286e08c0966eb26e;p=pandora-kernel.git Merge branch 'sh/stable-updates' Conflicts: arch/sh/mm/cache-sh4.c --- abeaf33a4101764291ec79cf286e08c0966eb26e Reading git-diff-tree failed