| commit | ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 16 11:14:44 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 16 11:14:44 2011 -0700 |
| tree | 73c2ac345b631ee16ba07682c6c451fdce23b15f | |
| parent | 4bc9b0796b5abe6dffa16faaa7f6b9b25dd4b251 [diff] | |
| parent | df3d8ae1f8780166a16dd7d08b4842a4d5b5f2b4 [diff] |
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