From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 03:55:58 +0000 (-0800)
Subject: Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=507447473756e316f3f182324071389a51736a83;p=~shefty%2Frdma-dev.git

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
---

507447473756e316f3f182324071389a51736a83