From: H. Peter Anvin Date: Tue, 24 Feb 2009 23:59:14 +0000 (-0800) Subject: Merge branch 'x86/defconfig' into x86/mce2 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2aaa822984b97efd894d10d1e1382206ef0291a7;p=linux-2.6-omap-h63xx.git Merge branch 'x86/defconfig' into x86/mce2 Conflicts (resolved): arch/x86/configs/x86_64_defconfig Signed-off-by: H. Peter Anvin --- 2aaa822984b97efd894d10d1e1382206ef0291a7