From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 9 Jan 2012 02:12:55 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v3.3-rc1~91^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca371d2854d48c0c22e7aa031df182f96dc85820;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-shmobile/clock-sh73a0.c

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

ca371d2854d48c0c22e7aa031df182f96dc85820
Reading git-diff-tree failed