[libdrm/f20: 3/3] Merge remote-tracking branch 'origin/master' into f20

[Dave Airlie]

commit 9be9fba678e2941f543277aa6745498ce26d475c
Merge: 6500528 2d3cad3
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 10 12:47:37 2014 +1000

    Merge remote-tracking branch 'origin/master' into f20

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