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

[Peter Lemenkov]

commit 52db53e906c2a11c659887e85d801400e0109901
Merge: 9be6e60 d5ca5b9
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jul 12 23:21:44 2011 +0400

    Merge branch 'master' into el5

 ...Initial-commit-of-autotools-related-files.patch |   20 ++++++++------
 ...dmidecode-path-defined-at-configure-stage.patch |    6 ++--
 ...0003-Use-flashrom-s-version-from-config.h.patch |   16 +++++-----
 ..._LIBPCI-from-config.h-instead-of-NEED_PCI.patch |   28 ++++++++++----------
 ...ros-from-config.h-instead-of-HAVE_UTSNAME.patch |    8 +++---
 ...86-related-ifdefs-in-code-this-is-now-con.patch |   26 +++++++++---------
 flashrom-0007-Simplify-hwaccess.c.patch            |    6 ++--
 ...diannes-determined-at-the-configure-stage.patch |    4 +-
 ...Use-HAVE_-_H-macro-for-detecting-includes.patch |    4 +-
 ...ove-arch-checking-ifdef-block-into-header.patch |    6 ++--
 flashrom.spec                                      |   11 +++++--
 sources                                            |    2 +-
 12 files changed, 72 insertions(+), 65 deletions(-)
---