[bios_extract/el6/master: 5/5] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit b2b5288ba82dc564edcf64267f8bcb9adad9bab1
Merge: 1d9f255 c0fbfec
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Jan 22 09:55:46 2011 +0300

    Merge branch 'master' into el6/master
    
    Conflicts:
    	.gitignore
    	bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch
    	bios_extract.spec
    	sources

 .gitignore                                         |    1 +
 ...tification-of-some-more-Award-BIOS-images.patch |   14 ++++----
 ...e-with-modules-filenames-containing-slash.patch |   36 --------------------
 bios_extract-0003-Allow-CFLAGS-override.patch      |   24 -------------
 bios_extract.spec                                  |   24 ++++++-------
 sources                                            |    2 +-
 6 files changed, 20 insertions(+), 81 deletions(-)
---