From 601dad0d987fc3630ee45f742012b4f5e526b07f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mar 11 2011 02:49:44 +0000
Subject: Merge branch 'master' into f15


---

diff --git a/10-quirks.conf b/10-quirks.conf
index 7afad22..82d3ec2 100644
--- a/10-quirks.conf
+++ b/10-quirks.conf
@@ -8,3 +8,13 @@ Section "InputClass"
         MatchProduct "ThinkPad HDAPS accelerometer data"
         Option "Ignore" "on"
 EndSection
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=523914
+# Mouse does not move in PV Xen guest
+# Explicitly tell evdev to not ignore the absolute axes.
+Section "InputClass"
+        Identifier "Xen Virtual Pointer axis blacklist"
+        MatchProduct "Xen Virtual Pointer"
+        Option "IgnoreAbsoluteAxes" "off"
+        Option "IgnoreRelativeAxes" "off"
+EndSection
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6ced687..33c14a2 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -30,7 +30,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.10.0
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Release:   3%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -544,6 +544,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Mar 11 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.0-3
+- Add Xen virtual pointer quirk to 10-quirks.conf (#523914, #679699)
+
 * Wed Mar 09 2011 Adam Jackson <ajax@redhat.com> 1.10.0-2
 - Merge from F16: