Merge branch 'linus' into queue
authorMarcelo Tosatti <mtosatti@redhat.com>
Thu, 19 Apr 2012 20:06:26 +0000 (17:06 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Thu, 19 Apr 2012 20:06:26 +0000 (17:06 -0300)
commiteac0556750e727ff39144a9a9e59d5ccf1fc0e2a
treef5ccff7795b2ad5e47f17fb475599c526f533e79
parentf71fa31f9f7ac33cba12b8897983f950ad2c7a5b
parent19853301ef3289bda2d5264c1093e74efddaeab9
Merge branch 'linus' into queue

Merge reason: development work has dependency on kvm patches merged
upstream.

Conflicts:
Documentation/feature-removal-schedule.txt

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Documentation/feature-removal-schedule.txt
arch/x86/kvm/vmx.c
include/linux/kvm_host.h
virt/kvm/kvm_main.c