Merge branch 'master' into next

author Andre Noll <maan@systemlinux.org>

Sun, 3 May 2009 17:09:16 +0000 (19:09 +0200)

committer Andre Noll <maan@systemlinux.org>

Sun, 3 May 2009 17:09:16 +0000 (19:09 +0200)
author Andre Noll <maan@systemlinux.org>
Sun, 3 May 2009 17:09:16 +0000 (19:09 +0200)
committer Andre Noll <maan@systemlinux.org>
Sun, 3 May 2009 17:09:16 +0000 (19:09 +0200)
diff --cc alsa_write.c
Simple merge
diff --cc error.h
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sun, 3 May 2009 17:09:16 +0000 (19:09 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sun, 3 May 2009 17:09:16 +0000 (19:09 +0200)
		1	2
alsa_write.c	patch \|	diff1 \|	diff2 \|	blob \| history
error.h	patch \|	diff1 \|	diff2 \|	blob \| history