[flashrom/el5/master: 35/35] Merge branch 'master' into el5/master

[Peter Lemenkov]

commit 8c0ffbcd061fe1149521c1b8e02fb00f66476270
Merge: 2a3466c 523d4bd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jan 4 20:43:21 2011 +0300

    Merge branch 'master' into el5/master
    
    Conflicts:
    	.gitignore
    	flashrom.spec
    	sources

 .gitignore                                         |    3 +
 flashrom-0.9.2.tar.bz2.asc                         |    7 -
 ...Initial-commit-of-autotools-related-files.patch |  427 ++++++++++++++++++++
 ...dmidecode-path-defined-at-configure-stage.patch |   26 ++
 ...0003-Use-flashrom-s-version-from-config.h.patch |   79 ++++
 ..._LIBPCI-from-config.h-instead-of-NEED_PCI.patch |  105 +++++
 ...ros-from-config.h-instead-of-HAVE_UTSNAME.patch |   35 ++
 ...86-related-ifdefs-in-code-this-is-now-con.patch |  199 +++++++++
 flashrom-0007-Simplify-hwaccess.c.patch            |  146 +++++++
 ...diannes-determined-at-the-configure-stage.patch |   91 +++++
 ...Kill-unused-__FLASHROM_HAVE_OUTB__-define.patch |   26 ++
 ...Use-HAVE_-_H-macro-for-detecting-includes.patch |  123 ++++++
 ...om-0011-Add-more-comments-cosmetic-change.patch |   49 +++
 ...ove-arch-checking-ifdef-block-into-header.patch |   78 ++++
 flashrom-0013-rtl8169-support.patch                |   61 +++
 flashrom.spec                                      |  103 ++++-
 sources                                            |    2 +-
 17 files changed, 1538 insertions(+), 22 deletions(-)
---