| commit | a7b917256d8afacadc614414c4b0d411f76f3747 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 07:49:45 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 07:49:45 2010 -0700 |
| tree | 295558a19f52e4c507da57204cc6a86ba22708c6 | |
| parent | dee70a32fa90cd05a5e34d03a48d549473569101 [diff] | |
| parent | b03214d559471359e2a85ae256686381d0672f29 [diff] |
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