tree 73c2ac345b631ee16ba07682c6c451fdce23b15f
parent 4bc9b0796b5abe6dffa16faaa7f6b9b25dd4b251
parent df3d8ae1f8780166a16dd7d08b4842a4d5b5f2b4
author Linus Torvalds <torvalds@linux-foundation.org> 1313518484 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1313518484 -0700

Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/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