diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-28 01:16:39 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-28 01:16:39 +0100 |
commit | 18a44a7ff1075ce5157ac07cde573aca6b5e9973 (patch) | |
tree | 8b857b12887da983b75bfd0d693df23edb810ba5 /drivers/scsi/sd.c | |
parent | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare... (diff) | |
parent | x86: Make sure we can boot in the case the BDA contains pure garbage (diff) | |
download | linux-18a44a7ff1075ce5157ac07cde573aca6b5e9973.tar.xz linux-18a44a7ff1075ce5157ac07cde573aca6b5e9973.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull more x86 fixes from Peter Anvin:
"Additional x86 fixes. Three of these patches are pure documentation,
two are pretty trivial; the remaining one fixes boot problems on some
non-BIOS machines."
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Make sure we can boot in the case the BDA contains pure garbage
x86, efi: Mark disable_runtime as __initdata
x86, doc: Fix incorrect comment about 64-bit code segment descriptors
doc, kernel-parameters: Document 'console=hvc<n>'
doc, xen: Mention 'earlyprintk=xen' in the documentation.
ACPI: Overriding ACPI tables via initrd only works with an initrd and on X86
Diffstat (limited to 'drivers/scsi/sd.c')
0 files changed, 0 insertions, 0 deletions