Don Zickus 96a84c20d6 lockup detector: Compile fixes from removing the old x86 nmi watchdog ... My patch that removed the old x86 nmi watchdog broke other arches. This change reverts a piece of that patch and puts the change in the correct spot. Signed-off-by: Don Zickus <dzickus@redhat.com> Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: fweisbec@gmail.com Cc: yinghai@kernel.org LKML-Reference: <1291068437-5331-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-12-10 00:01:06 +01:00
..
acpi	Merge branch 'misc' into release	2010-10-26 14:51:00 -04:00
asm-generic	asm-generic/stat.h: support 64-bit file time_t for stat()	2010-11-01 15:31:29 -04:00
crypto	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
drm	drm/nouveau: Expose some BO usage flags to userspace.	2010-11-18 14:38:29 +10:00
keys
linux	lockup detector: Compile fixes from removing the old x86 nmi watchdog	2010-12-10 00:01:06 +01:00
math-emu
media	[media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions	2010-11-22 11:56:26 -02:00
mtd	mtd: Define MLC Flash as a different flash type	2010-10-25 00:50:20 +01:00
net	af_unix: limit recursion level	2010-11-29 09:45:15 -08:00
pcmcia	pcmcia: IOCARD is also required for using IRQs	2010-10-22 08:46:36 +02:00
rdma	IB/core: Add VLAN support for IBoE	2010-10-25 10:20:39 -07:00
rxrpc
scsi	SCSI host lock push-down	2010-11-16 13:33:23 -08:00
sound	ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI	2010-11-24 15:29:56 +09:00
trace	Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core	2010-11-18 20:07:12 +01:00
video	fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define	2010-11-16 10:14:22 +09:00
xen	xen: fix MSI setup and teardown for PV on HVM guests	2010-12-02 14:34:25 +00:00
Kbuild