[xorg-x11-server/f15/master: 2/2] Merge branch 'master' into f15

[Peter Hutterer]

commit 601dad0d987fc3630ee45f742012b4f5e526b07f
Merge: f71c405 e108d14
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 11 12:49:44 2011 +1000

    Merge branch 'master' into f15

 10-quirks.conf       |   10 ++++++++++
 xorg-x11-server.spec |    5 ++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --cc xorg-x11-server.spec
index 6ced687,75b4fc6..33c14a2
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@@ -544,29 -545,19 +544,32 @@@ rm -rf $RPM_BUILD_ROO
  %{xserver_source_dir}
  
  %changelog
+ * Fri Mar 11 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.10.0-3
+ - Add Xen virtual pointer quirk to 10-quirks.conf (#523914, #679699)
+ 
  * Wed Mar 09 2011 Adam Jackson <ajax at redhat.com> 1.10.0-2
 -- Disable filesystem caps in paranoia until module loading is audited
 -
 -* Fri Feb 25 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.902-1
 -- xserver 1.10.0
 -- server-1.9-99.901-xkb-repeat-issues.patch: drop, merged
 -- xserver-1.4.99-pic-libxf86config.patch: drop, see 60801ff8
 -- xserver-1.6.99-default-modes.patch: drop, see dc498b4
 -- xserver-1.7.1-multilib.patch: drop, see a16e282
 -- ABI bumps: xinput to 12.2, extension to 5.0, video to 10.0
 +- Merge from F16:
 +
 +    * Wed Mar 09 2011 Adam Jackson <ajax at redhat.com> 1.10.0-2
 +    - Disable filesystem caps in paranoia until module loading is audited
 +
 +    * Fri Feb 25 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.902-1
 +    - xserver 1.10.0
 +    - server-1.9-99.901-xkb-repeat-issues.patch: drop, merged
 +    - xserver-1.4.99-pic-libxf86config.patch: drop, see 60801ff8
 +    - xserver-1.6.99-default-modes.patch: drop, see dc498b4
 +    - xserver-1.7.1-multilib.patch: drop, see a16e282
 +    - ABI bumps: xinput to 12.2, extension to 5.0, video to 10.0
 +
 +* Fri Feb 25 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.1-6.20101201
 +- xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch (#676827)
 +- xserver-1.9.99.1-xfree86-swap-the-order-to-be-merged-lists-in-xf86Col.patch
 +  (#676827)
 +
 +* Thu Feb 24 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.1-5.20101201
 +- xserver-1.9.99.1-xkb-split-out-keymap-compilation.patch (#676827 prep work)
 +- xserver-1.9.99.1-xkb-if-the-keymap-failed-to-compile-load-the-default.patch
 +  (#676827 fix)
  
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.99.1-4.20101201
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild