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

[Simone Caronni]

commit fb2c4ddc9ce38feb710153fa0ce5c9aae2a1ddf9
Merge: 4fedc41 78992dd
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Aug 29 16:05:29 2013 +0200

    Merge branch 'master' into el6

 dkms-fix-mkrpm.patch |    4 ++--
 dkms.spec            |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---