From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Feb 2009 05:31:23 +0000 (+0100)
Subject: Merge branches 'x86/urgent' and 'x86/pat' into x86/core
X-Git-Tag: v2.6.30-rc1~211^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=801c0be81454901e02c49abe12929c67e7d1cb55;p=pandora-kernel.git

Merge branches 'x86/urgent' and 'x86/pat' into x86/core

Conflicts:
	arch/x86/include/asm/pat.h
---

801c0be81454901e02c49abe12929c67e7d1cb55
Reading git-diff-tree failed