| commit | 55de1ed2f597646c6c7f0bbe2da1680c760b0d40 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 2 Mar 2014 04:48:14 +0000 (1 22:48 -0600) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 2 Mar 2014 04:48:14 +0000 (1 22:48 -0600) | ||
| tree | f60ea018beb0b7fe9ed60346e09f87127b4f965e | treesnapshot (tar.gz zip) |
| parent | 702256e604ec143f69b391485ab32b2948772838 | commitdiff |
| parent | e290e8c59dbc2a15088d868170d799f763202fef | commitdiff |
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"The VMCOREINFO patch I'll pushing for this release to avoid having a
release with kASLR and but without that information.
I was hoping to include the FPU patches from Suresh, but ran into a
problem (see other thread); will try to make them happen next week"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, kaslr: add missed "static" declarations
x86, kaslr: export offset in VMCOREINFO ELF notes
Pull x86 fixes from Peter Anvin:
"The VMCOREINFO patch I'll pushing for this release to avoid having a
release with kASLR and but without that information.
I was hoping to include the FPU patches from Suresh, but ran into a
problem (see other thread); will try to make them happen next week"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, kaslr: add missed "static" declarations
x86, kaslr: export offset in VMCOREINFO ELF notes