From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 20 Aug 2010 11:52:23 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.37-rc1~136^2~69
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9afa3e015273a52718e0a7efe198a0df76be880;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/process_32.c

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

b9afa3e015273a52718e0a7efe198a0df76be880
Reading git-diff-tree failed