Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sun, 3 May 2009 17:09:16 +0000 (19:09 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 3 May 2009 17:09:16 +0000 (19:09 +0200)
1  2 
alsa_write.c
error.h

diff --cc alsa_write.c
Simple merge
diff --cc error.h
Simple merge