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

[Simone Caronni]

commit 5cec784c6ad772ac8a4163c48fc3ecad60c2ca25
Merge: f958439 4a6e7c7
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jun 26 09:01:05 2013 +0200

    Merge branch 'master' into f17

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