projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4bc9b07
df3d8ae
)
Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 16 Aug 2011 18:14:44 +0000
(11:14 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 16 Aug 2011 18:14:44 +0000
(11:14 -0700)
* '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
Trivial merge