[xorg-x11-drv-ati: 3/3] Merge branch 'f15'

[Dave Airlie]

commit 4cce728f9ea604327b8b39b03e78c8116d520a89
Merge: b2759d8 4648464
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu May 12 12:23:35 2011 +1000

    Merge branch 'f15'
    
    Conflicts:
    	xorg-x11-drv-ati.spec

 .gitignore                                  |    1 +
 0001-R520-Fix-textures-larger-than-2k.patch |  147 ---------------------------
 sources                                     |    1 +
 xorg-x11-drv-ati.spec                       |   13 ++-
 4 files changed, 9 insertions(+), 153 deletions(-)
---
diff --cc xorg-x11-drv-ati.spec
index 9aec3cc,c391ea4..212915b
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@@ -83,9 -81,9 +81,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man4/radeon.4*
  
  %changelog
 +* Tue May 10 2011 Peter Hutterer <peter.hutterer at redhat.com> 6.14.0-9.20110316gitcdfc007ec
 +- Rebuild for what will be server 1.11 one day
 +
+ * Wed May 04 2011 Dave Airlie <airlied at redhat.com> 6.14.1-1.20110504gita6d2dba6
+ - resnapshot to include r520 fix + fusion DFS fix.
+ 
  * Thu Apr 14 2011 Adam Jackson <ajax at redhat.com> 6.14.0-8.20110316gitcdfc007ec
  - Fix large texture rendering bugs in EXA and Xv on R520 chips.