Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 29 Aug 2009 20:29:17 +0000 (22:29 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 29 Aug 2009 20:29:17 +0000 (22:29 +0200)
1  2 
NEWS
alsa_write.c

diff --cc NEWS
Simple merge
diff --cc alsa_write.c
Simple merge