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
..
acorn
acpi	Pull misc-for-upstream into release branch	2007-05-10 04:06:12 -04:00
amba
ata	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2007-05-12 18:11:33 -07:00
atm	Use menuconfig objects II - netdev/atm	2007-05-11 17:53:21 -04:00
auxdisplay	[S390] Kconfig: refine depends statements.	2007-05-10 15:46:07 +02:00
base	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2007-05-09 12:54:17 -07:00
block	fix deadlock in loop.c	2007-05-13 09:44:05 -07:00
bluetooth	[Bluetooth] Fix unintentional fall-through in HCI line discipline	2007-05-10 23:45:06 -07:00
cdrom	mm: remove destroy_dirty_buffers from invalidate_bdev()	2007-05-07 12:12:55 -07:00
char	Revert "ipmi: add new IPMI nmi watchdog handling"	2007-05-14 15:24:24 -07:00
clocksource
connector
cpufreq	Add suspend-related notifications for CPU hotplug	2007-05-09 12:30:56 -07:00
crypto	[S390] Kconfig: use common Kconfig files for s390.	2007-05-10 15:46:08 +02:00
dio
dma	[S390] Kconfig: unwanted menus for s390.	2007-05-10 15:46:07 +02:00
edac	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
eisa	virtual_eisa_root_init() should be __init	2007-05-08 11:15:02 -07:00
fc4
firewire	firewire: Convert OHCI driver to use standard goto unwinding for error handling.	2007-05-10 18:24:14 +02:00
firmware
hid	USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release()	2007-05-10 08:45:56 +02:00
hwmon	Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2007-05-10 11:50:51 -07:00
i2c	Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2007-05-10 11:50:51 -07:00
ide	[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()	2007-05-11 17:19:02 +01:00
ieee1394	Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2007-05-10 13:30:08 -07:00
infiniband	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
input	Input: evdev - fix overflow in compat_ioctl	2007-05-11 09:08:04 -07:00
isdn	[S390] Kconfig: unwanted menus for s390.	2007-05-10 15:46:07 +02:00
kvm	[S390] Kconfig: refine depends statements.	2007-05-10 15:46:07 +02:00
leds	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
macintosh	Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6	2007-05-09 15:41:31 -07:00
mca	mca: add integrated device bus matching	2007-05-09 12:30:49 -07:00
md	md: improve the is_mddev_idle test	2007-05-11 08:29:37 -07:00
media	Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb	2007-05-11 12:57:16 -07:00
message	[S390] Kconfig: refine depends statements.	2007-05-10 15:46:07 +02:00
mfd	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
misc	Pull misc-for-upstream into release branch	2007-05-10 04:06:12 -04:00
mmc	pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response	2007-05-14 18:51:48 +02:00
mtd	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
net	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2007-05-12 18:11:33 -07:00
nubus
oprofile
parisc	header cleaning: don't include smp_lock.h when not used	2007-05-08 11:15:07 -07:00
parport	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
pci	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev	2007-05-11 16:03:03 -07:00
pcmcia	fix hotplug for legacy platform drivers	2007-05-08 11:15:10 -07:00
pnp	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
ps3	Merge branch 'linux-2.6'	2007-05-08 13:37:51 +10:00
rapidio
rtc	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2007-05-11 09:59:50 -07:00
s390	[S390] Kconfig: use common Kconfig files for s390.	2007-05-10 15:46:08 +02:00
sbus	[SPARC] SBUS: display7seg.c needs asm/io.h	2007-05-13 22:22:47 -07:00
scsi	[SCSI]: Add help text for SCSI_ESP_CORE.	2007-05-13 23:52:14 -07:00
serial	[SERIAL] SUNHV: Add an ID string.	2007-05-13 21:27:37 -07:00
sh
sn
spi	MPC52xx PSC SPI master driver	2007-05-11 08:29:35 -07:00
tc
telephony	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
usb	[ARM] 4370/3: AT91: Support for Atmel AT91SAM9RL processors.	2007-05-11 21:07:54 +01:00
video	[VIDEO]: XVR-500 and XVR-2500 need FB=y.	2007-05-14 04:18:38 -07:00
w1	[S390] Kconfig: menus with depends on HAS_IOMEM.	2007-05-10 15:46:07 +02:00
zorro	Amiga Zorro bus: kill resource_size_t warnings	2007-05-04 17:59:08 -07:00
Kconfig
Makefile	Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2007-05-10 13:30:08 -07:00