diff options
| author | Linus Torvalds | 2014-03-08 02:38:36 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-03-08 02:38:36 +0100 |
| commit | 95648c0e9fdd1cb1199ef387025d684704a8e62e (patch) | |
| tree | adaf2c45384c306bc43c0d8272c9062f88dcf669 /arch/arm/include/asm/memory.h | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | x86: Ignore NMIs that come in during early boot (diff) | |
| download | kernel-qcow2-linux-95648c0e9fdd1cb1199ef387025d684704a8e62e.tar.gz kernel-qcow2-linux-95648c0e9fdd1cb1199ef387025d684704a8e62e.tar.xz kernel-qcow2-linux-95648c0e9fdd1cb1199ef387025d684704a8e62e.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"A small collection of minor fixes. The FPU stuff is still pending, I
fear. I haven't heard anything from Suresh so I suspect I'm going to
have to dig into the init specifics myself and fix up the patchset"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Ignore NMIs that come in during early boot
x86, trace: Further robustify CR2 handling vs tracing
x86, trace: Fix CR2 corruption when tracing page faults
x86/efi: Quirk out SGI UV
Diffstat (limited to 'arch/arm/include/asm/memory.h')
0 files changed, 0 insertions, 0 deletions