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

[Dave Airlie]

commit 1958c0dd669dbc67a1ee50a7d2fa3906f286d4c8
Merge: fd17778 5b852a4
Author: Dave Airlie <airlied at gmail.com>
Date:   Sun Nov 24 16:45:25 2013 +1000

    Merge branch 'master' into f20
    
    Conflicts:
    	libdrm.spec

 .gitignore                                         |    1 +
 ...vent-undefined-behavior-in-nouveau_pushbu.patch |   31 --------------------
 libdrm.spec                                        |    8 ++--
 sources                                            |    2 +-
 4 files changed, 6 insertions(+), 36 deletions(-)
---