diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-20 22:57:43 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-20 22:57:43 (GMT) |
| commit | a4cc3889f7e2c3f2fd15b492822c889fed5e1800 (patch) | |
| tree | d455a7392bc48aa44f61346e09b9cab63522d5b9 /mm/memcontrol.c | |
| parent | bb893d15b564f7711b60e0bc12966d049980582d (diff) | |
| parent | 95ef1e52922cf75b1ea2eae54ef886f2cc47eecb (diff) | |
| download | linux-fsl-qoriq-a4cc3889f7e2c3f2fd15b492822c889fed5e1800.tar.xz | |
Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM guest: prevent tracing recursion with kvmclock
Revert "KVM: PPC: Add support for explicit HIOR setting"
KVM: VMX: Check for automatic switch msr table overflow
KVM: VMX: Add support for guest/host-only profiling
KVM: VMX: add support for switching of PERF_GLOBAL_CTRL
KVM: s390: announce SYNC_MMU
KVM: s390: Fix tprot locking
KVM: s390: handle SIGP sense running intercepts
KVM: s390: Fix RUNNING flag misinterpretation
Diffstat (limited to 'mm/memcontrol.c')
0 files changed, 0 insertions, 0 deletions