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

[Simone Caronni]

commit 23cd1767a37ca984ce2c544affcd499cc1161cee
Merge: 9b454ad 0d2890d
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jan 17 14:24:48 2014 +0100

    Merge branch 'master' into el6

 dkms.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---