]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fad7fd2) | patch
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)
commitd1d069d1d5462472aaab09787d6c5c0ae9c2da0c
tree77d3cf8a2d30988161e17e124a9c039267146009tree | snapshot
parentfad7fd2c5896dca1bc81bdd4439d429a216ff066commit | diff
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>
arch/x86/Kconfig diff | blob | history
Linux Kernel Source Tree.