[SCM] intel-vaapi-driver/master: Merge tag 'upstream/1.2.1'

[mfv-guest at users.alioth.debian.org]

Imported Upstream version 1.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e6e4c1dcd38ac8c63f84475ea50e0a07838ccf59
X-Git-Newrev: 375706d91cf6b9d6b7845243ffca486a07c0c206

The following commit has been merged in the master branch:
commit 86d93789747131daee6f1a8c4ba23c34630e912e
Merge: 86de062fdbd565f1ad52a37124edd5b6fb4ce510 84b5b66fb6548908ef21f4fbf5533a3411b9a450
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Oct 15 09:57:51 2013 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature made Tue Oct 15 09:57:46 2013 CEST using RSA key ID 83B2CF7A
    # gpg: Good signature from "Matteo F. Vescovi <mfv.debian at gmail.com>"


-- 
intel-vaapi-driver packaging