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
..
boot	x86, boot: use .code16gcc instead of .code16	2009-06-16 17:47:32 -07:00
configs	Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:30:41 -07:00
crypto	crypto: aes-ni - Add support for more modes	2009-06-02 14:04:16 +10:00
ia32	Merge branch 'core/signal' into perfcounters/core	2009-04-30 21:16:49 +02:00
include/asm	Merge branch 'x86/urgent' into x86/mce3	2009-06-17 18:21:41 +02:00
kernel	x86: fix duplicated sysfs attribute	2009-06-17 21:43:16 -07:00
kvm	KVM: Add VT-x machine check support	2009-06-10 12:27:08 +03:00
lguest	lguest: PAE support	2009-06-12 22:27:08 +09:30
lib	x86: MSR: add methods for writing of an MSR on several CPUs	2009-06-10 12:18:43 +02:00
math-emu	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
mm	Merge branch 'linus' into x86/urgent	2009-06-17 08:59:10 +02:00
oprofile	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
pci	Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:25:41 -07:00
power	x86: unify power/cpu_(32|64).c	2009-06-12 21:32:31 +02:00
vdso	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
video
xen	Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 16:16:27 -07:00
Kbuild	x86: standardize Kbuild rules	2009-04-16 18:09:02 +02:00
Kconfig	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
Kconfig.cpu	Revert "x86, bts: reenable ptrace branch trace support"	2009-06-11 00:32:00 +02:00
Kconfig.debug	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 19:53:40 -07:00
Makefile	Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:30:41 -07:00
Makefile_32.cpu