From: Paul Mundt Date: Fri, 16 Oct 2009 09:16:02 +0000 (+0900) Subject: Merge branch 'sh/stable-updates' X-Git-Tag: v2.6.33-rc1~347^2~27^2~71 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78aed4a63aaa67f22cb1b541dd7528139a24c289;p=pandora-kernel.git Merge branch 'sh/stable-updates' Conflicts: arch/sh/Kconfig --- 78aed4a63aaa67f22cb1b541dd7528139a24c289 Reading git-diff-tree failed