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

[Simone Caronni]

commit 41a7e6bc3a4165a2aa9227b9bb28b824994dc338
Merge: f69c2b6 5dc66dd
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jul 23 18:31:51 2014 +0200

    Merge branch 'master' into el6

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