Yinghai Lu 74b602c714 x86: fix duplicated sysfs attribute ...

The sysfs attribute cmci_disabled was accidentall turned into a
duplicate of ignore_ce, breaking all other attributes.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2009-06-17 21:43:16 -07:00

..

alpha

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-06-15 03:02:23 -07:00

arm

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-06-15 03:02:23 -07:00

avr32

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-06-15 03:02:23 -07:00

blackfin

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

2009-06-16 11:49:58 -07:00

cris

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-12 18:15:51 -07:00

frv

FRV: Fix interaction with new generic header stuff

2009-06-13 13:17:28 -07:00

h8300

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-12 18:15:51 -07:00

ia64

[IA64] fix compile error in arch/ia64/mm/extable.c

2009-06-15 09:17:50 -07:00

m32r

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-12 18:15:51 -07:00

m68k

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-12 18:15:51 -07:00

m68knommu

module: cleanup FIXME comments about trimming exception table entries.

2009-06-12 21:47:05 +09:30

microblaze

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-12 18:15:51 -07:00

mips

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

2009-06-16 11:29:17 -07:00

mn10300

headers_check fix: mn10300, setup.h

2009-06-14 11:51:12 +05:30

parisc

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-06-15 03:02:23 -07:00

powerpc

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2009-06-16 11:30:37 -07:00

s390

[S390] s390: hibernation support for s390

2009-06-16 10:31:22 +02:00

sh

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-12 18:15:51 -07:00

sparc

sparc64: Update defconfig.

2009-06-16 04:59:53 -07:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-12 18:15:51 -07:00

x86

x86: fix duplicated sysfs attribute

2009-06-17 21:43:16 -07:00

xtensa

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-12 18:15:51 -07:00

.gitignore

…

Kconfig

…