summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 02:29:06 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 02:29:06 +0300
commitf797484c26300fec842fb669c69a3a60eb66e240 (patch)
treeebec99273a584e458832e258360a688616e7bad4 /net
parent991bc36254457f7f5695c0a28b39a91b104067a3 (diff)
parent80e9a4f21fd7ccce7e9b8439986fd028c9946dda (diff)
downloadlinux-f797484c26300fec842fb669c69a3a60eb66e240.tar.xz
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar: "Two changes: - implement various VMWare guest OS improvements/fixes (Alexey Makhalov) - unexport a spurious export from the intel-mid platform driver (Lukas Wunner)" * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/vmware: Add paravirt sched clock x86/vmware: Add basic paravirt ops support x86/vmware: Use tsc_khz value for calibrate_cpu() x86/platform/intel-mid: Unexport intel_mid_pci_set_power_state() x86/vmware: Read tsc_khz only once at boot time
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions