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

[Simone Caronni]

commit 8ef03256287847f0acf8a4340a0634ee6d62afcc
Merge: e99d246 cfa7fec
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Aug 29 15:34:34 2013 +0200

    Merge branch 'master' into el6

 dkms-fix-mkrpm.patch |   12 ++++++++++++
 dkms.spec            |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---