diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 18:07:47 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 18:07:47 +0200 |
commit | 7a5e87867e9fe043c3067a864124caf2b8e7fb99 (patch) | |
tree | 6ff53a7e65dabc9f25d6e162e38176da4995a274 /fs/logfs | |
parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
parent | Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mflem... (diff) | |
download | linux-7a5e87867e9fe043c3067a864124caf2b8e7fb99.tar.xz linux-7a5e87867e9fe043c3067a864124caf2b8e7fb99.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes:
EFI fixes, a build fix, a page table dumping (debug) fix and a clang
build fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/arm64: Fix fdt-related memory reservation
x86/mm: Apply the section attribute to the variable, not its type
x86/efi: Fixup GOT in all boot code paths
x86/efi: Only load initrd above 4g on second try
x86-64, ptdump: Mark espfix area only if existent
x86, irq: Fix build error caused by 9eabc99a635a77cbf09
Diffstat (limited to 'fs/logfs')
0 files changed, 0 insertions, 0 deletions