Linus Torvalds faa8b6c3c2 Revert "ipmi: add new IPMI nmi watchdog handling" ... This reverts commit f64da958df. Andi Kleen is unhappy with the changes, and they really do not seem worth it. IPMI could use DIE_NMI_IPI instead of the new callback, even though that ends up having its own set of problems too, mainly because the IPMI code cannot really know the NMI was from IPMI or not. Manually fix up conflicts in arch/x86_64/kernel/traps.c and drivers/char/ipmi/ipmi_watchdog.c. Cc: Andi Kleen <ak@suse.de> Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Corey Minyard <minyard@acm.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2007-05-14 15:24:24 -07:00
..
boot	[PATCH] x86-64: Share identical video.S between i386 and x86-64	2007-05-02 19:27:21 +02:00
crypto	[CRYPTO] api: Get rid of flags argument to setkey	2006-09-21 11:41:02 +10:00
ia32	x86_64: use signalfd and timerfd compat syscalls	2007-05-12 09:47:15 -07:00
kernel	Revert "ipmi: add new IPMI nmi watchdog handling"	2007-05-14 15:24:24 -07:00
lib	Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq	2007-02-26 14:17:50 -08:00
mm	header cleaning: don't include smp_lock.h when not used	2007-05-08 11:15:07 -07:00
oprofile	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
pci	[PATCH] mmconfig: fix unreachable_devices()	2007-02-13 13:26:20 +01:00
Kconfig	Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6	2007-05-05 14:55:20 -07:00
Kconfig.debug	[PATCH] lockdep: irqtrace subsystem, x86_64 support	2006-07-03 15:27:03 -07:00
Makefile	[PATCH] x86-64: Remove CONFIG_REORDER	2007-05-02 19:27:21 +02:00
defconfig	[PATCH] x86-64: Update defconfig	2007-05-02 19:27:04 +02:00