| commit | 9b82e65d65c90faecc408bcdc14a0229736ed193 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 23 20:19:31 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 23 20:19:31 2011 -0800 |
| tree | 2cf5fd4f4df01c6488afd0046325405381a73e36 | |
| parent | 8174a06eba10a43375d1dd6f74c58a71519e3be5 [diff] | |
| parent | e6af578c5305be693a1bc7f4dc7b51dd82d41425 [diff] |
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