From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 19 Aug 2009 00:12:00 +0000 (+0900)
Subject: Merge branch 'master' into sh/cachetlb
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f;p=linux.git

Merge branch 'master' into sh/cachetlb

Conflicts:
	arch/sh/kernel/Makefile_64
---

ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f