Merge branch 't/sched_improvements'

author Andre Noll <maan@systemlinux.org>

Sat, 26 Mar 2011 12:50:34 +0000 (13:50 +0100)

committer Andre Noll <maan@systemlinux.org>

Sat, 26 Mar 2011 12:50:34 +0000 (13:50 +0100)
author Andre Noll <maan@systemlinux.org>
Sat, 26 Mar 2011 12:50:34 +0000 (13:50 +0100)
committer Andre Noll <maan@systemlinux.org>
Sat, 26 Mar 2011 12:50:34 +0000 (13:50 +0100)
diff --cc audiod.c
Simple merge
diff --cc audiod.cmd
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sat, 26 Mar 2011 12:50:34 +0000 (13:50 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 26 Mar 2011 12:50:34 +0000 (13:50 +0100)
		1	2
audiod.c	patch \|	diff1 \|	diff2 \|	blob \| history
audiod.cmd	patch \|	diff1 \|	diff2 \|	blob \| history