From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jul 2008 15:41:43 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~19681
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1dc60c53d36b08f361e1a2767c41196acce96d08;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix compile error with CONFIG_AS_CFI=n
  Documentation: document debugpat commandline option
  x86: sanitize Kconfig
  x86, suspend, acpi: correct and add comments about Big Real Mode
  x86, suspend, acpi: enter Big Real Mode

Fixed trivial conflict in include/asm-x86/dwarf2.h due to just using
different names for "cfi_ignore" (vs "__cfi_ignore") macro.
---

1dc60c53d36b08f361e1a2767c41196acce96d08