Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 18 Jul 2009 12:27:35 +0000 (14:27 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 18 Jul 2009 12:27:35 +0000 (14:27 +0200)
commitbae94d3ba972bb91626e5f15e2d5ac44da6b041d
treec1bd3c69ad6fabc6e3f660605cae9649349bbc39
parent4f01c486bb70a27f614cdc9c07a2b8d653db7605
parentff3b3cccbb2d8900270fddadcdb3bbc2f1d85f98
Merge branch 'master' into next

Conflicts:
audiod_command.c