Manual merge with Linus
[linux-2.6] / Documentation / sound /
drwxr-xr-x   ..
drwxr-xr-x - alsa
drwxr-xr-x - oss