[dkms/el6: 3/3] Merge branch 'master' into el6

[Simone Caronni]

commit f591419bf5b141042d854cb7c7d51f2b59b616a7
Merge: 41a7e6b 920257c
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Sep 8 13:15:23 2014 +0200

    Merge branch 'master' into el6

 dkms-bash-syntax-fix.patch |    2 +-
 dkms.spec                  |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---