OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dee70a3
b03214d
)
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:49:45 +0000
(07:49 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:49:45 +0000
(07:49 -0700)
* 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6:
virtio-pci: disable msi at startup
virtio: return ENOMEM on out of memory
Trivial merge