From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 7 Jan 2011 01:29:26 +0000 (+0900)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v2.6.38-rc1~462^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-shmobile/Kconfig

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

5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee
Reading git-diff-tree failed