From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 26 Jul 2008 14:30:19 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/core
X-Git-Tag: v2.6.28-rc1~699^2^8~23^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d3285d0b3af641ee446f0be8f0a7f40cb515b6;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/core

Conflicts:

	include/asm-x86/gpio.h

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

10d3285d0b3af641ee446f0be8f0a7f40cb515b6
Reading git-diff-tree failed