From: Linus Torvalds Date: Thu, 24 Nov 2011 04:19:31 +0000 (-0800) Subject: Merge git://github.com/rustyrussell/linux X-Git-Tag: v3.2-rc3~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b82e65d65c90faecc408bcdc14a0229736ed193;p=pandora-kernel.git 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 --- 9b82e65d65c90faecc408bcdc14a0229736ed193 Reading git-diff-tree failed