Skip to content
Commit 9b82e65d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8174a06e e6af578c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment