From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Jun 2009 16:31:52 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-virtio
X-Git-Tag: v3.12-rc1~14357
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16ffc3eeaa00d513b0076b7b2b96419f28acc912;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/rusty/linux-2.6-virtio

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-virtio:
  virtio: enhance id_matching for virtio drivers
  virtio: fix id_matching for virtio drivers
  virtio: handle short buffers in virtio_rng.
  virtio_blk: add missing __dev{init,exit} markings
  virtio: indirect ring entries (VIRTIO_RING_F_INDIRECT_DESC)
  virtio: teach virtio_has_feature() about transport features
  virtio: expose features in sysfs
  virtio_pci: optional MSI-X support
  virtio_pci: split up vp_interrupt
  virtio: find_vqs/del_vqs virtio operations
  virtio: add names to virtqueue struct, mapping from devices to queues.
  virtio: meet virtio spec by finalizing features before using device
  virtio: fix obsolete documentation on probe function
---

16ffc3eeaa00d513b0076b7b2b96419f28acc912