From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 5 Oct 2012 00:49:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'kraxel/usb.66' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=938406dfb11d8a40d9228b3596d49a583d7218ff;p=qemu.git

Merge remote-tracking branch 'kraxel/usb.66' into staging

* kraxel/usb.66:
  usb: Fix usb_packet_map() in the presence of IOMMUs
  usb-redir: Adjust pkg-config check for usbredirparser .pc file rename (v2)
  ehci: Fix interrupt packet MULT handling
  xhci: create a memory region for each port
  xhci: route string & usb hub support
  xhci: tweak limits
  compat: turn off msi/msix on xhci for old machine types
  add pc-1.3 machine type

Conflicts:
	hw/pc_piix.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

938406dfb11d8a40d9228b3596d49a583d7218ff