]> xenbits.xensource.com Git - xenclient/ioemu-pq.git/commitdiff
Merge branch 'th-alpha-3'
authorThomas Horsten <thomas.horsten@citrix.com>
Mon, 10 Aug 2009 10:30:03 +0000 (11:30 +0100)
committerThomas Horsten <thomas.horsten@citrix.com>
Mon, 10 Aug 2009 10:30:03 +0000 (11:30 +0100)
Conflicts:

master/dom0-driver
master/intel
master/series

1  2 
master/intel
master/series

diff --cc master/intel
Simple merge
diff --cc master/series
index a9102bb37ec2e486532dc68aff89acda3e6cd3fe,19b19f0655aa5e0a0e6fa9c924a87c77dd0d4c5c..210946e663cf566fa481325550097d771f8560d2
@@@ -19,6 -19,8 +19,9 @@@ ps2-passthroug
  alsa-fix
  alsa-config
  audio-volume-control
 +
  dont-remap-passthrough-mmio
+ fix-drop-mouse-keyboard
+ fix-imobile-mouse
+ new-input-code
  atapi-pass-through