From: Alexandre Bique <alexandre.bique@citrix.com>
Date: Tue, 4 Aug 2009 11:20:54 +0000 (+0000)
Subject: Merge branch 'master' of git://git.uk.xensource.com/xenclient/ioemu-pq
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8dfa53dddcd4db1da071a3005d6e07bea62d800b;p=xenclient%2Fioemu-pq.git

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

Conflicts:

	master/series
---

8dfa53dddcd4db1da071a3005d6e07bea62d800b
diff --cc master/series
index be9dc6c,c02fbdc..a9102bb
--- a/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 e69de29,e69de29..7b33af0
--- a/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