diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:49:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:49:45 -0700 |
| commit | a7b917256d8afacadc614414c4b0d411f76f3747 (patch) | |
| tree | 295558a19f52e4c507da57204cc6a86ba22708c6 /fs | |
| parent | dee70a32fa90cd05a5e34d03a48d549473569101 (diff) | |
| parent | b03214d559471359e2a85ae256686381d0672f29 (diff) | |
| download | linux-a7b917256d8afacadc614414c4b0d411f76f3747.tar.bz2 | |
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6
* '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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions