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

[Simone Caronni]

commit e1199c2fd77c8300364cfb41979a23c743080d7c
Merge: bdda5fc 13a55a2
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 22 13:20:01 2013 +0200

    Merge branch 'master' into f17

 dkms.spec |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)
---