From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jun 2010 14:49:45 +0000 (-0700)
Subject: Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6
X-Git-Tag: v2.6.35-rc4~59
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a7b917256d8afacadc614414c4b0d411f76f3747;p=~shefty%2Frdma-dev.git

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
---

a7b917256d8afacadc614414c4b0d411f76f3747