[mesa/f20: 2/2] Merge branch 'f19' into f20

[Dave Airlie]

commit 1bef4ecf95a611a041d4eb4f474d050d47eab8ec
Merge: 84b1194 0cdd017
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Sep 2 16:36:32 2013 +1000

    Merge branch 'f19' into f20
    
    Conflicts:
    	mesa.spec

 .gitignore                       |    1 +
 mesa-9.2-no-gallium-osmesa.patch |   29 -----------------------------
 mesa.spec                        |    9 +++++----
 sources                          |    2 +-
 4 files changed, 7 insertions(+), 34 deletions(-)
---
diff --cc mesa.spec
index 0fb0a20,e530701..68458dc
--- a/mesa.spec
+++ b/mesa.spec
@@@ -602,9 -600,9 +600,12 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
+ * Mon Sep 02 2013 Dave Airlie <airlied at redhat.com> 9.2-1.20130902
+ - 9.2 upstream release + fixes from git branch
+ 
 +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.2-0.15.20130723
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
  * Tue Jul 23 2013 Adam Jackson <ajax at redhat.com> 9.2-0.14.20130723
  - Today's git snap of 9.2 branch