From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 16 Aug 2010 04:32:24 +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~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301;p=pandora-kernel.git

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

Conflicts:
	arch/sh/include/asm/Kbuild
	drivers/Makefile

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

bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301
Reading git-diff-tree failed