Merge branch 'alsa-utils-fix' into for-2009.08
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 19 Aug 2009 22:10:26 +0000 (00:10 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 19 Aug 2009 22:10:26 +0000 (00:10 +0200)
commit8bc2fbe6dc7dc1e27f0640799643b17fe771814b
treebe5e8bc8c043fb377ad5a730ce267d5c96833ac0
parent843c592a7c89dd564e17158871fa792aec1a5e97
parent350b6c6e4b039ae0256e52cd06c6f6d769a1c2b1
Merge branch 'alsa-utils-fix' into for-2009.08

Conflicts:
CHANGES
CHANGES