summaryrefslogtreecommitdiffstats
path: root/Kconfig
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-11-03 12:06:21 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-11-03 12:06:21 +0100
commit123b2dd10b4659911ef38458573a57f94cbf5448 (patch)
tree536765a44b6fb25f024a8387f4677f994015b041 /Kconfig
parentf62c95fd4041d669159dd76ac0bb2a7f86b5b05d (diff)
parent0df1f2487d2f0d04703f142813d53615d62a1da4 (diff)
downloadlinux-123b2dd10b4659911ef38458573a57f94cbf5448.tar.gz
linux-123b2dd10b4659911ef38458573a57f94cbf5448.tar.bz2
linux-123b2dd10b4659911ef38458573a57f94cbf5448.zip
Merge remote-tracking branch 'origin/master' into HEAD
Several important fixes went in between 3.18-rc1 and 3.18-rc3, so KVM/x86 work for 3.19 will be based on 3.18-rc3.
Diffstat (limited to 'Kconfig')
0 files changed, 0 insertions, 0 deletions