[xorg-x11-server] rebase to 1.12.99.905 snapshot

[Dave Airlie]

commit 3f449eb72c658ba7df422e91c6d1814e7c5422cd
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Aug 22 09:08:00 2012 +1000

    rebase to 1.12.99.905 snapshot

 .gitignore                |    1 +
 commitid                  |    2 +-
 sources                   |    1 +
 xorg-x11-server.spec      |   13 ++--
 xserver-1.12.99-git.patch |  173 ---------------------------------------------
 5 files changed, 10 insertions(+), 180 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c8631e6..aa50479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-20120717.tar.xz
 /xorg-server-20120726.tar.xz
 /xorg-server-20120808.tar.xz
+/xorg-server-20120822.tar.xz
diff --git a/commitid b/commitid
index 8daf748..21cf3d4 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-c22c936b35cee60609041ccb7ee52c00b0634d7b
+6619f5c0e1086b57888ff7146e8ed5897b50d440
diff --git a/sources b/sources
index f556492..4971589 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 c6b0c5843a14b4d1ee967050a665ef64  xorg-server-20120808.tar.xz
+ff68cba6b6e5aba97a0a1b1e196dff47  xorg-server-20120822.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 9c68c36..ec0d6c7 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.
 
-%global gitdate 20120808
+%global gitdate 20120822
 %global stable_abi 1
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -21,7 +21,7 @@
 %global videodrv_minor 0
 %global xinput_major 18
 %global xinput_minor 0
-%global extension_major 6
+%global extension_major 7
 %global extension_minor 0
 %endif
 
@@ -42,8 +42,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.12.99.904
-Release:   4%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.12.99.905
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -100,8 +100,6 @@ Patch7023: 0002-linux-Make-failure-to-iopl-non-fatal.patch
 Patch7024: 0003-xfree86-Change-the-semantics-of-driverFunc-GET_REQUI.patch
 Patch7025: 0001-Always-install-vbe-and-int10-sdk-headers.patch
 
-Patch7026: xserver-1.12.99-git.patch
-
 # do not upstream - do not even use here yet
 # Patch7027: xserver-autobind-hotplug.patch
 
@@ -577,6 +575,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Aug 22 2012 Dave Airlie <airlied at redhat.com> 1.12.99.905-1
+- rebase to 1.12.99.905 snapshot
+
 * Fri Aug 17 2012 Dave Airlie <airlied at redhat.com> 1.12.99.904-4
 - autobind was horribly broken on unplug - drop it like its hotplug.