Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm master
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Aug 2011 18:14:44 +0000 (11:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Aug 2011 18:14:44 +0000 (11:14 -0700)
commitab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b
tree73c2ac345b631ee16ba07682c6c451fdce23b15f
parent4bc9b0796b5abe6dffa16faaa7f6b9b25dd4b251
parentdf3d8ae1f8780166a16dd7d08b4842a4d5b5f2b4
Merge branch 'kvm-updates/3.1' of git://git./virt/kvm/kvm

* 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: uses TASKSTATS, depends on NET
  KVM: fix TASK_DELAY_ACCT kconfig warning