[mesa/f15: 11/11] Merge remote-tracking branch 'origin/f16' into f15

[Adam Jackson]

commit 4631d3b19b5243743d5ae3df754461fb1688394a
Merge: 1f6c63f 50919da
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Dec 7 20:04:27 2011 -0500

    Merge remote-tracking branch 'origin/f16' into f15
    
    Conflicts:
    	.gitignore

 .gitignore                             |    8 +-----
 0001-nv50-fix-max-texture-levels.patch |   18 ++++++++++++++++
 mesa-7.11-fix-sw-24bpp.patch           |   32 +++++++++++++++++++++++++++++
 mesa.spec                              |   35 ++++++++++++++++++++++++++++---
 sources                                |    3 +-
 5 files changed, 85 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index f78f3b0,af521e5..4d1de2e
--- a/.gitignore
+++ b/.gitignore
@@@ -22,17 -22,8 +22,13 @@@ mesa-20100720.tar.bz
  /mesa-20110330.tar.xz
  /mesa-20110401.tar.xz
  /mesa-20110412.tar.xz
- <<<<<<< HEAD
 -/mesa-20110620.tar.xz
 +/mesa-20110506.tar.xz
 +/mesa-20110509.tar.xz
 +/mesa-20110525.tar.xz
 +/mesa-20110621.tar.xz
 +/mesa-20110626.tar.xz
 +/mesa-20110709.tar.xz
 +/mesa-20110729.tar.xz
  /mesa-20110730.tar.xz
- =======
- /mesa-20110620.tar.xz
- /mesa-20110730.tar.xz
--/MesaLib-7.11.tar.bz2
- >>>>>>> f16
+ /mesa-20111103.tar.xz
+ /MesaLib-7.11.2.tar.bz2