diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-16 11:19:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-16 11:19:25 -0800 |
| commit | de55bbbff21ce8e11271c3032086b082af815864 (patch) | |
| tree | b943ca5055b54f15827952e00172b5a8696ae92d /drivers/pcmcia/bcm63xx_pcmcia.h | |
| parent | 3b91270a0a2fe00b7aa1ce16b3ecf055315c64e3 (diff) | |
| parent | 0cafa3e714fa34af100c575ada31d52caea20957 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Microcode fixes, a Xen fix and a KASLR boot loading fix with certain
memory layouts"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode, AMD: Fix ucode patch stashing on 32-bit
x86/core, x86/xen/smp: Use 'die_complete' completion when taking CPU down
x86, microcode: Fix accessing dis_ucode_ldr on 32-bit
x86, kaslr: Prevent .bss from overlaping initrd
x86, microcode, AMD: Fix early ucode loading on 32-bit
Diffstat (limited to 'drivers/pcmcia/bcm63xx_pcmcia.h')
0 files changed, 0 insertions, 0 deletions