From: H. Peter Anvin <hpa@zytor.com>
Date: Tue, 24 Feb 2009 23:59:14 +0000 (-0800)
Subject: Merge branch 'x86/defconfig' into x86/mce2
X-Git-Tag: upstream/snapshot3+hdmi~18692^2~28^3~6^3~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2aaa822984b97efd894d10d1e1382206ef0291a7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'x86/defconfig' into x86/mce2

Conflicts (resolved):
	arch/x86/configs/x86_64_defconfig

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

2aaa822984b97efd894d10d1e1382206ef0291a7