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
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
c6x	Build fix for c6x	2014-03-07 09:52:46 -08:00
cris
frv
hexagon
ia64
m32r
m68k
metag
microblaze
mips
mn10300
openrisc
parisc
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
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
um
unicore32
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