]> git.alsa-project.org Git - alsa-utils.git/commitdiff
Merge branch 'ucm-upstream' of git://git.slimlogic.co.uk/alsa-utils into ucm
authorJaroslav Kysela <perex@perex.cz>
Wed, 22 Sep 2010 18:06:02 +0000 (20:06 +0200)
committerJaroslav Kysela <perex@perex.cz>
Wed, 22 Sep 2010 18:06:02 +0000 (20:06 +0200)

Trivial merge