From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 20 Oct 2008 02:17:52 +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.28-rc1~99^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cb40f795af36b3deb743f6ccf6c3fd542c61c8d;p=pandora-kernel.git

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

Conflicts:

	Documentation/kernel-parameters.txt
	arch/sh/include/asm/elf.h
---

4cb40f795af36b3deb743f6ccf6c3fd542c61c8d
Reading git-diff-tree failed