From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=a7b917256d8afacadc614414c4b0d411f76f3747;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'virtio' of git://git./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