Merge branch 'linus' into x86/doc
[linux-2.6] / Documentation / sound / alsa / DocBook /
drwxr-xr-x   ..
-rw-r--r-- 2902 alsa-driver-api.tmpl
-rw-r--r-- 204481 writing-an-alsa-driver.tmpl