Merge branch 'master' into next

author Andre Noll <maan@systemlinux.org>

Sun, 2 Aug 2009 13:31:16 +0000 (15:31 +0200)

committer Andre Noll <maan@systemlinux.org>

Sun, 2 Aug 2009 13:31:16 +0000 (15:31 +0200)
author Andre Noll <maan@systemlinux.org>
Sun, 2 Aug 2009 13:31:16 +0000 (15:31 +0200)
committer Andre Noll <maan@systemlinux.org>
Sun, 2 Aug 2009 13:31:16 +0000 (15:31 +0200)
diff --cc audiod.c
Simple merge
diff --cc filter.c
Simple merge
diff --cc filter.h
Simple merge
diff --cc filter_common.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sun, 2 Aug 2009 13:31:16 +0000 (15:31 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sun, 2 Aug 2009 13:31:16 +0000 (15:31 +0200)
		1	2
audiod.c	patch \|	diff1 \|	diff2 \|	blob \| history
filter.c	patch \|	diff1 \|	diff2 \|	blob \| history
filter.h	patch \|	diff1 \|	diff2 \|	blob \| history
filter_common.c	patch \|	diff1 \|	diff2 \|	blob \| history