[SCM] ffado/master: Merge tag 'upstream/2.2.1'

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

Imported Upstream version 2.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: 2db5450a6c89f6d2a5715ecce7d918cb20ae6c2d
X-Git-Newrev: bf095df8432c41227f88ca61011abca094db945f

The following commit has been merged in the master branch:
commit 38ea2127a64c853997eb3009bba3d7e38df0488d
Merge: 2db5450a6c89f6d2a5715ecce7d918cb20ae6c2d ed234651ea42afbaab0b6eb19dc1bccfe2f06ab5
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Jun 2 13:16:10 2014 +0000

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1
    
    # gpg: Signature made Mon Jun  2 13:15:58 2014 UTC using DSA key ID 60B25BF9
    # gpg: Good signature from "Adrian Knoth <adi at drcomp.erfurt.thur.de>"
    # gpg:                 aka "Adrian Knoth <adi at thur.de>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: F7FF 91E6 2CC4 73AD 5173  8EE4 5BB8 D1BE 60B2 5BF9


-- 
Free Firewire Audio Drivers (ffado.org) packaging