]> git.baikalelectronics.ru Git - 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)
commit76a270c828ebc0935b83a2b78efc921a47bbd83f
tree295558a19f52e4c507da57204cc6a86ba22708c6
parentbfc9e453e6b49565297bc3bd8cc4f3372e06bf51
parent4ea9b80a7b7c154af1b99a3e922ae406dc72b722
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