diff options
| author | Linus Torvalds | 2014-03-02 05:48:14 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-03-02 05:48:14 +0100 |
| commit | 55de1ed2f597646c6c7f0bbe2da1680c760b0d40 (patch) | |
| tree | f60ea018beb0b7fe9ed60346e09f87127b4f965e /kernel/events/core.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending (diff) | |
| parent | x86, kaslr: add missed "static" declarations (diff) | |
| download | kernel-qcow2-linux-55de1ed2f597646c6c7f0bbe2da1680c760b0d40.tar.gz kernel-qcow2-linux-55de1ed2f597646c6c7f0bbe2da1680c760b0d40.tar.xz kernel-qcow2-linux-55de1ed2f597646c6c7f0bbe2da1680c760b0d40.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:
"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
Diffstat (limited to 'kernel/events/core.c')
0 files changed, 0 insertions, 0 deletions