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

[Dave Airlie]

commit f429df54d44d84bbc18084e05bf4fcc452b3d89c
Merge: 941664f 7cfbeac
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Dec 5 11:27:47 2013 +1000

    Merge branch 'master' into f20

 .gitignore                                         |    1 +
 ...te-unaligned-offset-for-2D-1D-tiling-tran.patch |   32 -----
 ...ntel-Track-known-prime-buffers-for-re-use.patch |  131 --------------------
 libdrm.spec                                        |   13 +--
 sources                                            |    2 +-
 5 files changed, 7 insertions(+), 172 deletions(-)
---