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

Conflicts:

	master/series

diff --cc master/master/series
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2902194c59bc0cfe9995ac5fd6ebb43214ec0758
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/master/master/series
@@@ -1,0 -1,0 +1,36 @@@
++
++ioemu-compil
++
++remove_ram_limit
++
++alsa-fix
++alsa-config
++audio-volume-control
++
++add-config-audio
++
++xenstore-watch-callbacks
++dm-ready
++suspend-by-signal
++
++battery-management
++oem-features
++thermal-management
++xenstore-notify-pm-events
++
++vga-passthrough
++switcher
++intel
++
++fix-imobile-mouse
++atapi-pass-through
++do-atapi-locking-properly
++atapi-succeed-on-lock-door
++pv_driver_throttling_disabled
++vga-clear-hw-fb-on-resize
++hide-msi-capability-for-igfx
++vga-edid
++tidy-muticies-in-ata-pt
++alsa-fix-resume
++guest-os-controlled-brightness-support
++kbd-led

diff --cc master/series
index 2a4772839fe9af2477894bd6f2484aa2f6410498,e1340b1e82db6ab00a41a8bc39ba2e3af4aef554..2902194c59bc0cfe9995ac5fd6ebb43214ec0758
--- 1/master/series
--- 2/master/series
+++ b/master/series
@@@ -33,4 -32,4 +32,5 @@@ hide-msi-capability-for-igf
  vga-edid
  tidy-muticies-in-ata-pt
  alsa-fix-resume
+ guest-os-controlled-brightness-support
 +kbd-led