aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/inst.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-31 17:10:36 +1100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-31 17:10:36 +1100
commit04c2eee5b9dfcb13f3cd07a5537fb8c785f2751a (patch)
treea70cf1df64b3715c502211233dc307abacaed7da /arch/mips/include/asm/inst.h
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentMerge tag 'efi-for-3.8' into x86/efi (diff)
downloadlinux-dev-04c2eee5b9dfcb13f3cd07a5537fb8c785f2751a.tar.xz
linux-dev-04c2eee5b9dfcb13f3cd07a5537fb8c785f2751a.zip
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 EFI fixes from Peter Anvin: "This is a collection of fixes for the EFI support. The controversial bit here is a set of patches which bumps the boot protocol version as part of fixing some serious problems with the EFI handover protocol, used when booting under EFI using a bootloader as opposed to directly from EFI. These changes should also make it a lot saner to support cross-mode 32/64-bit EFI booting in the future. Getting these changes into 3.8 means we avoid presenting an inconsistent ABI to bootloaders. Other changes are display detection and fixing efivarfs." * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, efi: remove attribute check from setup_efi_pci x86, build: Dynamically find entry points in compressed startup code x86, efi: Fix PCI ROM handing in EFI boot stub, in 32-bit mode x86, efi: Fix 32-bit EFI handover protocol entry point x86, efi: Fix display detection in EFI boot stub x86, boot: Define the 2.12 bzImage boot protocol x86/boot: Fix minor fd leakage in tools/relocs.c x86, efi: Set runtime_version to the EFI spec revision x86, efi: fix 32-bit warnings in setup_efi_pci() efivarfs: Delete dentry from dcache in efivarfs_file_write() efivarfs: Never return ENOENT from firmware efi, x86: Pass a proper identity mapping in efi_call_phys_prelog efivarfs: Drop link count of the right inode
Diffstat (limited to 'arch/mips/include/asm/inst.h')
0 files changed, 0 insertions, 0 deletions