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

[Simone Caronni]

commit 3cbb4b80781613934c6d3a85d3cd8a5a01bddcae
Merge: 83461d9 920257c
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Sep 8 13:15:27 2014 +0200

    Merge branch 'master' into el5

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