summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-23 19:38:21 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-23 19:38:21 +0200
commitb4db920c7f524b2cd0f5ae7efbbbbfd2c76a27da (patch)
tree699d993308bf375476dbe149e3aa41bbeee42ffb /arch/x86
parentMerge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentx86, hyper: Change hypervisor detection order (diff)
parentx86-32, fpu: Fix DNA exception during check_fpu() (diff)
parentkexec, x86: Fix incorrect jump back address if not preserving context (diff)
parentx86, config: Introduce an INTEL_MID configuration (diff)
parentx86, quirks: Use pci_dev->revision (diff)
parentx86: tsc: Remove unneeded DMI-based blacklisting (diff)
parentx86, boot: Wait for boot cpu to show up if nr_cpus limit is about to hit (diff)
downloadlinux-b4db920c7f524b2cd0f5ae7efbbbbfd2c76a27da.tar.xz
linux-b4db920c7f524b2cd0f5ae7efbbbbfd2c76a27da.zip
Merge branches 'x86-detect-hyper-for-linus', 'x86-fpu-for-linus', 'x86-kexec-for-linus', 'x86-platform-for-linus', 'x86-quirks-for-linus', 'x86-tsc-for-linus' and 'x86-smpboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-detect-hyper-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, hyper: Change hypervisor detection order * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-32, fpu: Fix DNA exception during check_fpu() * 'x86-kexec-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kexec, x86: Fix incorrect jump back address if not preserving context * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, config: Introduce an INTEL_MID configuration * 'x86-quirks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, quirks: Use pci_dev->revision * 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: tsc: Remove unneeded DMI-based blacklisting * 'x86-smpboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, boot: Wait for boot cpu to show up if nr_cpus limit is about to hit