From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 28 Aug 2008 02:17:07 +0000 (-0700)
Subject: Merge branch 'x86/urgent' into x86/cpu
X-Git-Tag: v2.6.28-rc1~699^2^8~5^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b30a72a7edfc64c8929104d5c2178aca489aa559;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/cpu

Conflicts:

	arch/x86/kernel/cpu/cyrix.c
---

b30a72a7edfc64c8929104d5c2178aca489aa559
Reading git-diff-tree failed