[phoronix-test-suite/el6: 2/2] Merge branch 'master' into el6

[Markus Mayer]

commit 25b6a9de3c83da9afbaf1cb9fbc018bcea358e1e
Merge: a3cdf86 2d553c6
Author: Markus Mayer <lotharlutz at gmx.de>
Date:   Sun Jul 20 14:37:35 2014 +0200

    Merge branch 'master' into el6

 .gitignore               |    1 +
 phoronix-test-suite.spec |    5 ++++-
 sources                  |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---