From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 16 Sep 2009 04:48:32 +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.32-rc1~640^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea88023b3491a384575ebcd5e8a449e841a28a24;p=pandora-kernel.git

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

Conflicts:
	arch/sh/kernel/vmlinux.lds.S
---

ea88023b3491a384575ebcd5e8a449e841a28a24
Reading git-diff-tree failed