[libdrm/f16: 7/7] Merge remote-tracking branch 'origin/master' into origin/f16

[Dave Airlie]

commit af92edcc0996ca71de4e21a86836f29e94852bbe
Merge: 59a8b23 4f8585d
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Apr 17 18:52:16 2012 +0100

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

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