| commit | 1dc60c53d36b08f361e1a2767c41196acce96d08 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 15 Jul 2008 15:41:43 +0000 (15 08:41 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 15 Jul 2008 15:41:43 +0000 (15 08:41 -0700) | ||
| tree | 35966ad2c2465e6f722d199e4b1799fb4c6f2b46 | treesnapshot (tar.gz zip) |
| parent | 8d2567a620ae8c24968a2bdc1c906c724fac1f6a | commitdiff |
| parent | 3f1c38723eb467d34d704d0ee6e7b796ba4981ee | commitdiff |
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.
* '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.