diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-15 05:07:51 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-15 05:07:51 +0400 |
| commit | a4ecdf82f8ea49f7d3a072121dcbd0bf3a7cb93a (patch) | |
| tree | b6e3ae76d485294631c4ac2777956ae1116f455a /net/wireless/nl80211.h | |
| parent | cee152ff8a3c8aedf7b97417889f9319a7002141 (diff) | |
| parent | 847d7970defb45540735b3fb4e88471c27cacd85 (diff) | |
| download | linux-a4ecdf82f8ea49f7d3a072121dcbd0bf3a7cb93a.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"Two x86 fixes: Suresh's eager FPU fix, and a fix to the NUMA quirk for
AMD northbridges.
This only includes Suresh's fix patch, not the "mostly a cleanup"
patch which had __init issues"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/amd/numa: Fix northbridge quirk to assign correct NUMA node
x86, fpu: Check tsk_used_math() in kernel_fpu_end() for eager FPU
Diffstat (limited to 'net/wireless/nl80211.h')
0 files changed, 0 insertions, 0 deletions