Merge branch 't/nonblock_api'

author Andre Noll <maan@systemlinux.org>

Thu, 13 May 2010 11:08:59 +0000 (13:08 +0200)

committer Andre Noll <maan@systemlinux.org>

Thu, 13 May 2010 11:08:59 +0000 (13:08 +0200)
author Andre Noll <maan@systemlinux.org>
Thu, 13 May 2010 11:08:59 +0000 (13:08 +0200)
committer Andre Noll <maan@systemlinux.org>
Thu, 13 May 2010 11:08:59 +0000 (13:08 +0200)
diff --cc audiod.c
Simple merge
diff --cc error.h
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Thu, 13 May 2010 11:08:59 +0000 (13:08 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Thu, 13 May 2010 11:08:59 +0000 (13:08 +0200)
		1	2
audiod.c	patch \|	diff1 \|	diff2 \|	blob \| history
error.h	patch \|	diff1 \|	diff2 \|	blob \| history