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

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

Conflicts:
	arch/arm/mach-shmobile/Makefile

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

04cf399640b7acfa9abe2eb7900cd934db8af697
Reading git-diff-tree failed