From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 12 Jul 2008 05:29:02 +0000 (+0200)
Subject: Merge branch 'linus' into x86/core
X-Git-Tag: v2.6.27-rc1~1106^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae94b8075a2ed58d2318ef03827b25bc844f844e;p=pandora-kernel.git

Merge branch 'linus' into x86/core

Conflicts:

	arch/x86/mm/ioremap.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

ae94b8075a2ed58d2318ef03827b25bc844f844e
Reading git-diff-tree failed