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

[Simone Caronni]

commit 098ae7df9a0a5ba292d563ea7f95dc7294d21415
Merge: 35bef8f 4a6e7c7
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jun 26 09:01:07 2013 +0200

    Merge branch 'master' into el6

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