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
..
acpi	…
asm-alpha	…
asm-arm	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2007-05-12 18:11:33 -07:00
asm-arm26	…
asm-avr32	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2007-05-12 18:11:33 -07:00
asm-blackfin	…
asm-cris	…
asm-frv	…
asm-generic	Merge branch 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current	2007-05-11 09:57:16 -07:00
asm-h8300	…
asm-i386	Revert "ipmi: add new IPMI nmi watchdog handling"	2007-05-14 15:24:24 -07:00
asm-ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2007-05-11 12:53:21 -07:00
asm-m32r	…
asm-m68k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2007-05-11 10:30:00 -07:00
asm-m68knommu	…
asm-mips	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22	2007-05-11 10:00:50 -07:00
asm-parisc	…
asm-powerpc	…
asm-ppc	…
asm-s390	…
asm-sh	…
asm-sh64	…
asm-sparc	[SPARC32]: asm/system.h needs asm/smp.h	2007-05-14 03:53:47 -07:00
asm-sparc64	[SPARC64]: Accept ebus_bus_type for generic DMA ops.	2007-05-14 02:56:03 -07:00
asm-um	…
asm-v850	…
asm-x86_64	Revert "ipmi: add new IPMI nmi watchdog handling"	2007-05-14 15:24:24 -07:00
asm-xtensa	…
crypto	…
keys	…
linux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2007-05-14 12:29:14 -07:00
math-emu	…
media	…
mtd	…
net	…
pcmcia	…
rdma	…
rxrpc	…
scsi	…
sound	…
video	atmel_lcdfb: AT91/AT32 LCD Controller framebuffer driver	2007-05-11 08:29:37 -07:00
Kbuild	…