Merge git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Nov 2011 04:19:31 +0000 (20:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Nov 2011 04:19:31 +0000 (20:19 -0800)
commit9b82e65d65c90faecc408bcdc14a0229736ed193
tree2cf5fd4f4df01c6488afd0046325405381a73e36
parent8174a06eba10a43375d1dd6f74c58a71519e3be5
parente6af578c5305be693a1bc7f4dc7b51dd82d41425
Merge git://github.com/rustyrussell/linux

* git://github.com/rustyrussell/linux:
  virtio-pci: make reset operation safer
  virtio-mmio: Correct the name of the guest features selector
  virtio: add HAS_IOMEM dependency to MMIO platform bus driver