From 68143df18c3cdb026da6b21f9cff35be1a00366b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 26 Jul 2012 13:16:02 +1000
Subject: [PATCH] rebase to 1.12.99.903 snapshot

---
 .gitignore           | 1 +
 commitid             | 2 +-
 sources              | 2 +-
 xorg-x11-server.spec | 9 ++++++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9645991..8a2b10f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-1.12.2.tar.bz2
 /xorg-server-1.12.3.tar.bz2
 /xorg-server-20120717.tar.xz
+/xorg-server-20120726.tar.xz
diff --git a/commitid b/commitid
index 220e259..3d69f98 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-77de2994774e7be24a0bad521180628feb1027c6
+afa53fe7cffd430cf11f25ca818cb955a78c0c1c
diff --git a/sources b/sources
index 6937562..c9bdb5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-961bb1ecade0ade9a4f0c04be063142c  xorg-server-20120717.tar.xz
+cf47efdea83833e3348f1f7adcd19d57  xorg-server-20120726.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index eb00227..7dfcc9b 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 # check out the master branch, pull, cherry-pick, and push.  FIXME describe
 # rebasing, add convenience 'make' targets maybe.
 
-%define gitdate 20120717
+%define gitdate 20120726
 %define stable_abi 1
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -47,8 +47,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.12.99.902
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.12.99.903
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -573,6 +573,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Jul 26 2012 Dave Airlie <airlied@redhat.com> 1.12.99.903-1
+- rebase to 1.12.99.903 snapshot
+
 * Wed Jul 25 2012 Dave Airlie <airlied@redhat.com> 1.12.99.902-3
 - fix crash due to GLX being linked twice