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

[Simone Caronni]

commit 98ff94be4fd6eed9c20084f3aeccbc1a014ea928
Merge: 54a36e0 111e286
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 22 13:06:24 2013 +0200

    Merge branch 'master' into el6

 dkms.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---