]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:49:45 +0000 (07:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:49:45 +0000 (07:49 -0700)
commita7b917256d8afacadc614414c4b0d411f76f3747
tree295558a19f52e4c507da57204cc6a86ba22708c6
parentdee70a32fa90cd05a5e34d03a48d549473569101
parentb03214d559471359e2a85ae256686381d0672f29
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