| commit | 507447473756e316f3f182324071389a51736a83 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 11 19:55:58 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 11 19:55:58 2012 -0800 |
| tree | 39afec5235c3309179ee4da23866f20604a3d1e2 | |
| parent | 0019fab3558c8c8135c88c3d38f24ab0a5408aa6 [diff] | |
| parent | 6e87f9b7e48e165cb8e6092b9abe682e7065614a [diff] |
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 boot changes from Ingo Molnar: "Two small changes: a cleanup and allow CONFIG_X86_MPPARSE to be turned off on SFI as well." * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: arch/x86/Kconfig: Allow turning off CONFIG_X86_MPPARSE when either ACPI or SFI is present x86/boot/doc: Fix grammar and typo in boot.txt