From: Ingo Molnar Date: Wed, 10 Sep 2008 12:00:45 +0000 (+0200) Subject: Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect X-Git-Tag: v2.6.28-rc1~711^2^2~7 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1;p=linux-2.6-omap-h63xx.git Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect Conflicts: arch/x86/kernel/cpu/amd.c arch/x86/kernel/cpu/common.c arch/x86/kernel/cpu/common_64.c arch/x86/kernel/cpu/feature_names.c include/asm-x86/cpufeature.h Signed-off-by: Ingo Molnar --- 59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1