From: Paul Mundt Date: Mon, 26 Oct 2009 01:48:18 +0000 (+0900) Subject: Merge branch 'sh/stable-updates' X-Git-Tag: v2.6.33-rc1~347^2~27^2~61 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6253195b671b98a4e5da5d39c2df9f8f257bcea1;p=pandora-kernel.git Merge branch 'sh/stable-updates' Conflicts: arch/sh/kernel/dwarf.c --- 6253195b671b98a4e5da5d39c2df9f8f257bcea1 Reading git-diff-tree failed