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	ACPICA: Lindent	2007-05-09 23:34:35 -04:00
asm-alpha	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
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	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
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	rename thread_info to stack	2007-05-09 12:30:56 -07:00
asm-cris	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-frv	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
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	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
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	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-m68k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2007-05-11 10:30:00 -07:00
asm-m68knommu	Remove tas()	2007-05-08 11:15:20 -07:00
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	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-powerpc	powerpc: fixup hard_irq_disable semantics	2007-05-11 08:29:34 -07:00
asm-ppc	Merge branch 'linux-2.6'	2007-05-10 21:08:37 +10:00
asm-s390	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-sh	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-sh64	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
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	uml: iRQ stacks	2007-05-11 08:29:34 -07:00
asm-v850	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-x86_64	Revert "ipmi: add new IPMI nmi watchdog handling"	2007-05-14 15:24:24 -07:00
asm-xtensa	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
crypto	[CRYPTO] cryptd: Add software async crypto daemon	2007-05-02 14:38:32 +10:00
keys	[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both	2007-04-26 15:48:28 -07:00
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	Delete unused header file math-emu/extended.h	2007-05-08 11:15:05 -07:00
media	V4L/DVB (5592): DMA: Correctly free resources on error, sync PCI streamed data	2007-05-09 10:12:42 -03:00
mtd	UBI: Unsorted Block Images	2007-04-27 14:23:33 +03:00
net	[NETFILTER]: nf_conntrack: Removes unused destroy operation of l3proto	2007-05-10 23:47:46 -07:00
pcmcia	add new_id to PCMCIA drivers	2007-05-07 12:12:50 -07:00
rdma	IB: Put rlimit accounting struct in struct ib_umem	2007-05-08 18:00:37 -07:00
rxrpc	[AF_RXRPC]: Delete the old RxRPC code.	2007-04-26 15:55:48 -07:00
scsi	[SCSI] sas_scsi_host: Convert to use the kthread API	2007-05-06 09:33:17 -05:00
sound	[ALSA] version 1.0.14rc4	2007-05-11 16:56:18 +02:00
video	atmel_lcdfb: AT91/AT32 LCD Controller framebuffer driver	2007-05-11 08:29:37 -07:00
Kbuild	…