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

[Peter Lemenkov]

commit 0fe4e2e1339d95edb4e32bc78b5c3a191855a011
Merge: 8280ae0 4a6317d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat May 14 18:07:35 2011 +0400

    Merge branch 'master' into f14

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