From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 6 Jan 2011 09:24:07 +0000 (+0900)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v2.6.38-rc1~475^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f862f904d357dc0d3612347a8dbabe6fae037fbb;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6 into sh-latest

Conflicts:
	arch/sh/kernel/cpu/sh2a/clock-sh7201.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

f862f904d357dc0d3612347a8dbabe6fae037fbb