[dkms/f17: 4/4] Merge branch 'master' into f17

[Simone Caronni]

commit 28126bad8aae9783a781233226106a96e0d5ec93
Merge: 5cec784 c94c97d
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Sun Jul 21 15:38:44 2013 +0200

    Merge branch 'master' into f17

 dkms.service |    2 +-
 dkms.spec    |   19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)
---