diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-17 00:11:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-17 00:11:25 +0200 |
| commit | 01565479e99882e873e4dd2f6f067b7cba3acf8f (patch) | |
| tree | 014de0c29378ef1380ab6bb48baca135468aca35 /drivers/input/misc/axp20x-pek.c | |
| parent | fs/fuse: fix ioctl type confusion (diff) | |
| parent | x86/ldt: Further fix FPU emulation (diff) | |
| download | linux-01565479e99882e873e4dd2f6f067b7cba3acf8f.tar.xz linux-01565479e99882e873e4dd2f6f067b7cba3acf8f.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Merge x86 fixes from Ingo Molnar:
"Two followup fixes related to the previous LDT fix"
Also applied a further FPU emulation fix from Andy Lutomirski to the
branch before actually merging it.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
x86/ldt: Further fix FPU emulation
x86/ldt: Correct FPU emulation access to LDT
x86/ldt: Correct LDT access in single stepping logic
Diffstat (limited to 'drivers/input/misc/axp20x-pek.c')
0 files changed, 0 insertions, 0 deletions