summaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlm/dlmrecovery.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 00:15:32 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 00:15:32 +0400
commitc3c55a07203947f72afa50a3218460b27307c47d (patch)
treede3a2f8adbb3bea4bba1df0f709b0d6c1f4e87b7 /fs/ocfs2/dlm/dlmrecovery.c
parent046f153343e33dcad1be7f6249ea6ff1c6fd9b58 (diff)
parent74bcc2499291d38b6253f9dbd6af33a195222208 (diff)
downloadlinux-c3c55a07203947f72afa50a3218460b27307c47d.tar.xz
Merge branch 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull ARM64 EFI update from Peter Anvin: "By agreement with the ARM64 EFI maintainers, we have agreed to make -tip the upstream for all EFI patches. That is why this patchset comes from me :) This patchset enables EFI stub support for ARM64, like we already have on x86" * 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: arm64: efi: only attempt efi map setup if booting via EFI efi/arm64: ignore dtb= when UEFI SecureBoot is enabled doc: arm64: add description of EFI stub support arm64: efi: add EFI stub doc: arm: add UEFI support documentation arm64: add EFI runtime services efi: Add shared FDT related functions for ARM/ARM64 arm64: Add function to create identity mappings efi: add helper function to get UEFI params from FDT doc: efi-stub.txt updates for ARM lib: add fdt_empty_tree.c
Diffstat (limited to 'fs/ocfs2/dlm/dlmrecovery.c')
0 files changed, 0 insertions, 0 deletions