From: Daniel J Blueman <daniel@numascale-asia.com>
Date: Wed, 25 Jan 2012 06:35:49 +0000 (+0800)
Subject: x86/numachip: Drop unnecessary conflict with EDAC
X-Git-Tag: v3.3-rc2~24^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fe54564a61f72982032423d24041dca30617ca2;p=pandora-kernel.git

x86/numachip: Drop unnecessary conflict with EDAC

EDAC detection no longer crashes multi-node systems, so don't
conflict on it with NumaChip.

Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
Cc: Steffen Persvold <sp@numascale.com>
Link: http://lkml.kernel.org/r/1327473349-28395-1-git-send-email-daniel@numascale-asia.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

Reading git-diff-tree failed