From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Aug 2011 18:14:44 +0000 (-0700)
Subject: Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: MMI-PSA29.97-13-9~18553
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b