From: H. Peter Anvin <hpa@zytor.com>
Date: Sat, 23 May 2009 23:42:19 +0000 (-0700)
Subject: Merge branch 'x86/urgent' into x86/setup
X-Git-Tag: v2.6.31-rc1~413^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee0736627d3347be0be2769fa7b26431f9726c9d;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/setup

Resolved conflicts:
	arch/x86/boot/memory.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

ee0736627d3347be0be2769fa7b26431f9726c9d
Reading git-diff-tree failed