From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 1 Sep 2009 04:54:14 +0000 (+0900)
Subject: Merge branch 'master' into sh/smp
X-Git-Tag: v2.6.32-rc1~640^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac6a0cf6716bb46813d0161024c66c2af66e53d1;p=pandora-kernel.git

Merge branch 'master' into sh/smp

Conflicts:
	arch/sh/mm/cache-sh4.c
---

ac6a0cf6716bb46813d0161024c66c2af66e53d1
Reading git-diff-tree failed