Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121017.0' into staging