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

[Simone Caronni]

commit 24420fb0b23414cebe97b62c346834c23684f424
Merge: 1df865a cfa7fec
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Aug 29 15:34:36 2013 +0200

    Merge branch 'master' into el5

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