From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 May 2012 03:20:23 +0000 (-0700)
Subject: Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=99262a3dafa3290866512ddfb32609198f8973e9;p=linux-beck.git

Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

Pull virtio updates from Rusty Russell.

* tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio: fix typo in comment
  virtio-mmio: Devices parameter parsing
  virtio_blk: Drop unused request tracking list
  virtio-blk: Fix hot-unplug race in remove method
  virtio: Use ida to allocate virtio index
  virtio: balloon: separate out common code between remove and freeze functions
  virtio: balloon: drop restore_common()
  9p: disconnect channel when PCI device is removed
  virtio: update documentation to v0.9.5 of spec
---

99262a3dafa3290866512ddfb32609198f8973e9