Merge branch 'master' into next

author Andre Noll <maan@systemlinux.org>

Sat, 29 Aug 2009 20:29:17 +0000 (22:29 +0200)

committer Andre Noll <maan@systemlinux.org>

Sat, 29 Aug 2009 20:29:17 +0000 (22:29 +0200)
author Andre Noll <maan@systemlinux.org>
Sat, 29 Aug 2009 20:29:17 +0000 (22:29 +0200)
committer Andre Noll <maan@systemlinux.org>
Sat, 29 Aug 2009 20:29:17 +0000 (22:29 +0200)
diff --cc NEWS
Simple merge
diff --cc alsa_write.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sat, 29 Aug 2009 20:29:17 +0000 (22:29 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 29 Aug 2009 20:29:17 +0000 (22:29 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
alsa_write.c	patch \|	diff1 \|	diff2 \|	blob \| history