git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d2ebc71)
x86/numachip: Drop unnecessary conflict with EDAC
authorDaniel J Blueman <daniel@numascale-asia.com>
Wed, 25 Jan 2012 06:35:49 +0000 (14:35 +0800)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Jan 2012 10:03:03 +0000 (11:03 +0100)
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>

No differences found
Pandora Kernel Repository