[linux-firmware/f15: 4/4] Merge ../master into f15

[David Woodhouse]

commit 5d5dfc208b56e13f033f7f630c11d45c1f6cd4b6
Merge: 950728a 524b569
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Aug 3 08:37:01 2011 +0100

    Merge ../master into f15
    
    Conflicts:
    	.gitignore
    	linux-firmware.spec
    	sources

 .gitignore          |    1 +
 linux-firmware.spec |   10 ++++++++--
 sources             |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---