diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-01 02:00:23 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-01 02:00:23 +0100 |
commit | 7c17e486e865d616f0e37c7f7f0e4dcfab704cd8 (patch) | |
tree | f238c1c0055100f9e7a134211e934c5aecf6d873 /Makefile | |
parent | Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming (diff) | |
parent | x86, fpu: Avoid FPU lazy restore after suspend (diff) | |
download | linux-7c17e486e865d616f0e37c7f7f0e4dcfab704cd8.tar.xz linux-7c17e486e865d616f0e37c7f7f0e4dcfab704cd8.zip |
Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin.
This includes the resume-time FPU corruption fix from the chromeos guys,
marked for stable.
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, fpu: Avoid FPU lazy restore after suspend
x86-32: Unbreak booting on some 486 clones
x86, kvm: Remove incorrect redundant assembly constraint
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions