[xorg-x11-drv-intel/f16: 5/5] Merge branch 'f17' into f16

[Adam Jackson]

commit d635bc2851931df20a1e9b162f3842822b9dcf5d
Merge: 5a9c104 369d2d7
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 24 12:59:14 2012 -0400

    Merge branch 'f17' into f16

 .gitignore                                         |    1 +
 ...xa-Fix-clip-processing-for-uxa_fill_spans.patch |   53 -
 735219cd59e6184a6622d3d429a704ca3f58b9cd.patch     |   35 -
 85d3dc5910a2eea3a10b822e01443e11eaae9291.patch     |  121 --
 f6c82c73b673ec3c9cce432fe38d5e0076234efd.patch     |   36 -
 intel-2.11-no-pageflipping.patch                   |   41 -
 intel-2.11.0-vga-clock-max.patch                   |   23 -
 intel-2.17.0-legacy-dri1.patch                     |   16 -
 intel-2.18-fedora-branch.patch                     | 1171 ++++++++++++++++++++
 intel-2.8.0-lvds-first.patch                       |   36 -
 kill-svideo.patch                                  |   23 -
 lvds-modes.patch                                   |  160 ---
 sources                                            |    1 +
 xorg-x11-drv-intel.spec                            |   33 +-
 14 files changed, 1189 insertions(+), 561 deletions(-)
---
diff --cc .gitignore
index 2e9f8fc,c06d7c6..23e8bcb
--- a/.gitignore
+++ b/.gitignore
@@@ -6,4 -6,6 +6,5 @@@ xf86-video-intel-2.10.0.tar.bz
  /xf86-video-intel-2.14.0.tar.bz2
  /xf86-video-intel-2.15.0.tar.bz2
  /xf86-video-intel-2.15.901.tar.bz2
 -/xf86-video-intel-20111110.tar.bz2
  /xf86-video-intel-2.17.0.tar.bz2
+ /xf86-video-intel-2.18.0.tar.bz2