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

[Simone Caronni]

commit bdda5fc755e840ee9269c7e3d7b6dfe86ca11afc
Merge: 5ad4b80 111e286
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 22 13:06:22 2013 +0200

    Merge branch 'master' into f17

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