Daniel J Blueman 3fe54564a6 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>

2012-01-26 11:03:03 +01:00

..

alpha

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

arm

Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.

2012-01-23 14:50:30 -08:00

avr32

treewide: remove useless NORET_TYPE macro and uses

2012-01-12 20:13:03 -08:00

blackfin

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

c6x

C6X: replace tick_nohz_stop/restart_sched_tick calls

2012-01-08 15:13:16 -05:00

cris

lib: use generic pci_iomap on all architectures

2012-01-10 18:04:27 -08:00

frv

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

h8300

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

hexagon

lib: move GENERIC_IOMAP to lib/Kconfig

2011-11-24 22:21:19 +02:00

ia64

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-01-18 15:51:48 -08:00

m32r

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

m68k

treewide: convert uses of ATTRIB_NORETURN to __noreturn

2012-01-12 20:13:03 -08:00

microblaze

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit

2012-01-17 16:41:31 -08:00

mips

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit

2012-01-17 16:41:31 -08:00

mn10300

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

openrisc

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2012-01-16 14:34:54 -08:00

parisc

parisc, exec: remove redundant set_fs(USER_DS)

2012-01-12 20:13:04 -08:00

powerpc

powerpc: Fix build on some non-freescale platforms

2012-01-25 13:33:22 +11:00

s390

kdump: define KEXEC_NOTE_BYTES arch specific for s390x

2012-01-23 08:38:48 -08:00

score

score: fix off-by-one index into syscall table

2012-01-23 08:38:49 -08:00

sh

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit

2012-01-17 16:41:31 -08:00

sparc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit

2012-01-17 16:41:31 -08:00

tile

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit

2012-01-17 16:41:31 -08:00

unicore32

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

x86

x86/numachip: Drop unnecessary conflict with EDAC

2012-01-26 11:03:03 +01:00

xtensa

audit: inline audit_syscall_entry to reduce burden on archs

2012-01-17 16:16:56 -05:00

.gitignore

…

Kconfig

mm,x86,um: move CMPXCHG_DOUBLE config option

2012-01-12 20:13:03 -08:00