Anthony Liguori 0893d46014 Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
  target-i386: kvm: prevent buffer overflow if -cpu foo, [x]level is too big
  vmxcap: bit 9 of VMX_PROCBASED_CTLS2 is 'virtual interrupt delivery'

Conflicts:
	target-i386/kvm.c

Trivial merge resolution due to lack of context.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-01-29 16:57:41 -06:00
..
2012-03-30 08:14:11 -05:00
2012-07-17 15:43:16 -05:00
2012-03-24 12:57:02 +00:00
2012-03-30 08:14:11 -05:00
2012-04-16 15:41:20 +02:00
2012-08-15 15:18:54 +01:00
2012-03-24 14:10:25 +00:00