[linux-firmware/f14/master: 12/12] Merge branch 'master' into f14

[Dave Airlie]

commit a89b4bfc4038b41d8e524db1da497a770ecdd7e1
Merge: 4b0fd79 3466922
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Mar 10 10:52:42 2011 +1000

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	linux-firmware.spec
    	sources

 .gitignore          |    2 ++
 linux-firmware.spec |   26 +++++++++++++++-----------
 sources             |    3 +--
 3 files changed, 18 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index 3e6ecac,721db88..e710a38
--- a/.gitignore
+++ b/.gitignore
@@@ -4,3 -5,4 +5,4 @@@ radeon-rlc-firmware-1.tar.bz
  radeon-firmware-1.tar.bz2
  radeon-firmware-2.tar.bz2
  linux-firmware-20100806.tar.bz2
 -/linux-firmware-20110304.tar.bz2
++linux-firmware-20110304.tar.bz2