Merge branch 'master' of git://git.uk.xensource.com/xenclient/ioemu-pq

Conflicts:

	master/series

diff --cc master/series
index be9dc6c5b8fdfca9a38a1bdf0453323fa96adf83,c02fbdcdf29cb1adc7a0989612041e880b47fec0..a9102bb37ec2e486532dc68aff89acda3e6cd3fe
--- 1/master/series
--- 2/master/series
+++ b/master/series
@@@ -19,5 -19,4 +19,6 @@@ ps2-passthroug
  alsa-fix
  alsa-config
  audio-volume-control
 +
+ dont-remap-passthrough-mmio
 +atapi-pass-through

diff --cc master/status
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7b33af03b3bd7def3e4270d492462c0aa1191661
--- 1/master/status
--- 2/master/status
+++ b/master/status
@@@ -1,0 -1,0 +1,19 @@@
++ioemu-compil
++add-config-audio
++xenstore-watch-callbacks
++dm-ready
++suspend-by-signal
++battery-management
++oem-features
++thermal-management
++fix-build-warnings
++vga-passthrough
++dom0-driver
++intel
++use-vga-cmdline
++ps2-passthrough
++alsa-fix
++alsa-config
++audio-volume-control
++dont-remap-passthrough-mmio
++atapi-pass-through