[xorg-x11-drv-intel/f15: 15/16] Merge branch 'f16' into f15

[Adam Jackson]

commit 3cda5392a17cb9385f17936d19f0a9e46fca0544
Merge: d41d1cd f902ae5
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Dec 13 10:43:54 2011 -0500

    Merge branch 'f16' into f15

 .gitignore                                         |    2 +
 ...xa-Fix-clip-processing-for-uxa_fill_spans.patch |   53 ++++++++++++++++++
 intel-2.17.0-legacy-dri1.patch                     |   16 ++++++
 sources                                            |    4 +-
 xorg-x11-drv-intel.spec                            |   57 ++++++++++++++-----
 5 files changed, 115 insertions(+), 17 deletions(-)
---
diff --cc xorg-x11-drv-intel.spec
index ac0eb5d,de73044..dbf1bb2
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@@ -18,9 -18,14 +18,10 @@@ Source2:    intel.xin
  Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
  Source4:    make-git-snapshot.sh
  
 -# deactivated for now, maybe no longer needed
 -Patch1: kill-svideo.patch
 -# port me dangit
 -Patch2: copy-fb.patch
 -# needs to be upstreamed
 +#Patch2: copy-fb.patch
  Patch22: intel-2.11.0-vga-clock-max.patch
- Patch23: intel-2.15-stable.patch
+ Patch23: intel-2.17.0-legacy-dri1.patch
+ Patch24: 0001-uxa-Fix-clip-processing-for-uxa_fill_spans.patch
  
  ExclusiveArch: %{ix86} x86_64 ia64