[libdrm/f20: 2/2] Merge branch 'master' into f20

[Adam Jackson]

commit 4548caf419ef15db36b1180e35d513200bed8c36
Merge: 508989b d9d5be9
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed May 21 09:30:02 2014 -0400

    Merge branch 'master' into f20

 .gitignore  |    1 +
 libdrm.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---