Linus Torvalds b01d4e6893 x86: fix compile error due to X86_TRAP_NMI use in asm files ... It's an enum, not a #define, you can't use it in asm files. Introduced in commit 5fa10196bd ("x86: Ignore NMIs that come in during early boot"), and sadly I didn't compile-test things like I should have before pushing out. My weak excuse is that the x86 tree generally doesn't introduce stupid things like this (and the ARM pull afterwards doesn't cause me to do a compile-test either, since I don't cross-compile). Cc: Don Zickus <dzickus@redhat.com> Cc: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2014-03-07 18:58:40 -08:00
..
alpha	alpha: fix broken network checksum	2014-01-31 09:21:55 -08:00
arc	ARC: Use correct PTAG register for icache flush	2014-03-07 10:12:56 -08:00
arm	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-03-07 17:39:32 -08:00
arm64	Three x86 fixes and one for ARM/ARM64. In particular, nested	2014-02-28 11:45:03 -08:00
avr32	avr32: add generic vga.h to Kbuild	2014-02-17 11:24:48 +01:00
blackfin	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-01-31 09:31:14 -08:00
c6x	Build fix for c6x	2014-03-07 09:52:46 -08:00
cris	CRIS correction for 3.14	2014-01-28 09:01:14 -08:00
frv	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-01-30 16:58:05 -08:00
hexagon	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
ia64	[IA64] Wire up new sched_setattr and sched_getattr syscalls	2014-01-28 09:52:53 -08:00
m32r	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
m68k	m68k: Wire up sched_setattr and sched_getattr	2014-02-10 20:10:20 +01:00
metag	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
microblaze	microblaze: Fix a typo when disabling stack protection	2014-02-10 07:44:11 +01:00
mips	MIPS: fpu.h: Fix build when CONFIG_BUG is not set	2014-02-06 13:42:43 +01:00
mn10300	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-01-30 16:58:05 -08:00
openrisc	OpenRISC updates for 3.14	2014-01-30 17:08:41 -08:00
parisc	execve: use 'struct filename *' for executable name passing	2014-02-05 12:54:53 -08:00
powerpc	powerpc: Align p_dyn, p_rela and p_st symbols	2014-03-07 13:50:19 +11:00
s390	s390/pci/dma: use correct segment boundary size	2014-02-21 08:48:27 +01:00
score	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-01-31 09:31:14 -08:00
sh	sh: prefix sh-specific "CCR" and "CCR2" by "SH_"	2014-03-04 07:55:49 -08:00
sparc	sparc32: make copy_to/from_user_page() usable from modular code	2014-02-19 19:49:48 -05:00
tile	tile: remove compat_sys_lookup_dcookie declaration to fix compile error	2014-02-01 10:55:15 -08:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2014-01-26 11:06:16 -08:00
unicore32	arch/unicore32/kernel/early_printk.c:setup_early_printk: missing initialization	2014-01-27 21:02:39 -08:00
x86	x86: fix compile error due to X86_TRAP_NMI use in asm files	2014-03-07 18:58:40 -08:00
xtensa	Xtensa fixes for 3.14:	2014-02-24 00:34:36 -08:00
.gitignore
Kconfig	stackprotector: Introduce CONFIG_CC_STACKPROTECTOR_STRONG	2013-12-20 09:38:40 +01:00