[libva/f21: 4/4] Merge branch 'master' into f21

[Nicolas Chauvet]

commit f10a114717f4e277df35faa1a94c57e2073e3b5f
Merge: 35257d2 0ce85e0
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Tue Nov 4 00:19:44 2014 +0100

    Merge branch 'master' into f21

 .gitignore              |    2 ++
 firefox-crash-fix.patch |   36 ------------------------------------
 libva.spec              |   15 +++++++++++----
 sources                 |    2 +-
 4 files changed, 14 insertions(+), 41 deletions(-)
---