[flashrom/f12/master: 13/13] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit e1eaa1c0c01e7be9516f06b48c7a5229c8f76357
Merge: 711c0f3 a1e5088
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Oct 26 12:41:39 2010 +0400

    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore
    	flashrom-0.9.2.tar.bz2.asc
    	flashrom.spec
    	sources

 .gitignore                                         |    2 +
 flashrom-0.9.2.tar.bz2.asc                         |    7 -
 ...Initial-commit-of-autotools-related-files.patch |  858 ++++++++++++++++++++
 ...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.spec                                      |   84 ++-
 sources                                            |    2 +-
 16 files changed, 1888 insertions(+), 22 deletions(-)
---