[libdrm/f16: 3/3] Merge branch 'master' into f16

[Dave Airlie]

commit 59a8b23b203de0123b5a49cbcab2ae953118d2bf
Merge: 27cd24a c3f75b3
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jan 20 10:17:02 2012 +0000

    Merge branch 'master' into f16

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