diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-15 14:07:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-15 14:07:53 -0700 |
| commit | ae3b29e67ca361f0876dad6be2061699de95d126 (patch) | |
| tree | 26063709aa45ac714b2b10e22b62d23247a5a19d /arch/x86/net/Makefile | |
| parent | 652df602f8c5e99a3cec7d8e0c114e29d93b342f (diff) | |
| parent | cf8b166d5c1c89aad6c436a954fa40fd18a75bfb (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
- Fix for a CPU hot-add deadlock in microcode update code
- Fix for idle consolidation fallout
- Documentation update for initial kernel direct mapping
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Add missing comments for initial kernel direct mapping
x86/microcode: Add local mutex to fix physical CPU hot-add deadlock
x86: Fix idle consolidation fallout
Diffstat (limited to 'arch/x86/net/Makefile')
0 files changed, 0 insertions, 0 deletions