Merge branch 't/sched_improvements'
authorAndre Noll <maan@systemlinux.org>
Sat, 26 Mar 2011 12:50:34 +0000 (13:50 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 26 Mar 2011 12:50:34 +0000 (13:50 +0100)
1  2 
audiod.c
audiod.cmd

diff --cc audiod.c
Simple merge
diff --cc audiod.cmd
Simple merge