[xorg-x11-drv-intel/f18: 2/2] Merge branch 'master' into f18, and 2.20.7

[Adam Jackson]

commit 5603da1ff3543517ee37bff72fe0e8cc8e1971a9
Merge: 962ec41 91a7ddc
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Sep 10 15:49:14 2012 -0400

    Merge branch 'master' into f18, and 2.20.7
    
    Conflicts:
    	xorg-x11-drv-intel.spec
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

 .gitignore              |    1 +
 sources                 |    2 +-
 xorg-x11-drv-intel.spec |   23 +++++++++++++++++++----
 3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 1ef762c,3260611..7ffc2d0
--- a/.gitignore
+++ b/.gitignore
@@@ -20,4 -20,3 +20,5 @@@ xf86-video-intel-2.10.0.tar.bz
  /xf86-video-intel-2.20.4.tar.bz2
  /xf86-video-intel-2.20.5.tar.bz2
  /xf86-video-intel-2.20.6.tar.bz2
 +/xf86-video-intel-20120907.tar.bz2
++/xf86-video-intel-2.20.7.tar.bz2
diff --cc sources
index ba71e6c,523aadd..0e983b0
--- a/sources
+++ b/sources
@@@ -1,2 -1,2 +1,2 @@@
  3ad323489a5a8b821fd24811242a9eea  intel-gpu-tools-20110817.tar.bz2
- 3245419e78fb20ec4ce3652fa2b1bbef  xf86-video-intel-20120907.tar.bz2
 -7aed0905b9fd05956561e01ffd3f5a93  xf86-video-intel-2.20.6.tar.bz2
++583cbe1c8461182ee727b20151601247  xf86-video-intel-2.20.7.tar.bz2
diff --cc xorg-x11-drv-intel.spec
index 4299cce,22e4802..6a80144
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@@ -1,8 -1,8 +1,8 @@@
  %define moduledir %(pkg-config xorg-server --variable=moduledir )
  %define driverdir	%{moduledir}/drivers
  %define gputoolsdate 20110817
- %define gitdate 20120907
- %define gitrev .%{gitdate}
 -#define gitdate 20120816
++#define gitdate 20120907
+ #define gitrev .%{gitdate}
  
  %if 0%{?rhel} == 7
  %define rhel7 1
@@@ -13,8 -13,8 +13,8 @@@
  
  Summary:   Xorg X11 Intel video driver
  Name:      xorg-x11-drv-intel
--Version:   2.20.6
--Release:   2%{?gitrev}%{?dist}
++Version:   2.20.7
++Release:   1%{?gitrev}%{?dist}
  URL:       http://www.x.org
  License:   MIT
  Group:     User Interface/X Hardware Support
@@@ -131,9 -140,11 +138,17 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man1/intel_*.1*
  
  %changelog
++* Mon Sep 10 2012 Adam Jackson <ajax at redhat.com> 2.20.7-1
++- intel 2.20.7
++
 +* Fri Sep 07 2012 Dave Airlie <airlied at redhat.com> 2.20.6-2
 +- latest upstream git snapshot with prime + fixes
 +
+ * Tue Sep 04 2012 Adam Jackson <ajax at redhat.com> 2.20.6-2
+ - Only bother to build UMS (read: i810) support on 32-bit.  If you've
+   managed to build a machine with an i810 GPU but a 64-bit CPU, please
+   don't have done that.
+ 
  * Tue Sep 04 2012 Adam Jackson <ajax at redhat.com> 2.20.6-1
  - intel 2.20.6 (#853783)