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

[Simone Caronni]

commit d7615e13b3fd7150c6552d7d78102c3b862c19c1
Merge: 98ff94b 13a55a2
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 22 13:20:03 2013 +0200

    Merge branch 'master' into el6

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