diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 10:38:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 10:38:21 -0700 |
| commit | b4db920c7f524b2cd0f5ae7efbbbbfd2c76a27da (patch) | |
| tree | 699d993308bf375476dbe149e3aa41bbeee42ffb /arch/x86/kernel/tsc.c | |
| parent | 7080d306762f5e4a1418aec4f496af7f879c94c4 (diff) | |
| parent | 24a42bae6852d27ae569757f5415c91538e6a255 (diff) | |
| parent | 3e7cf5b00dd5b577b4ee9b2a66e40fb670ef210b (diff) | |
| parent | 050438ed5a05b25cdf287f5691e56a58c2606997 (diff) | |
| parent | 43605ef188cd39708ddc5e3adc47b337b6ebe40e (diff) | |
| parent | 38175051f8e79c5e9f65daab7200fd8d1fa4a912 (diff) | |
| parent | df049672dddde4a2fdacf63fb32eb80146e26841 (diff) | |
| parent | 14cb6dcf0a023f5977461c94d8d5a163c937979b (diff) | |
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