Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
[linux-2.6] / Documentation / sound /
drwxr-xr-x   ..
drwxr-xr-x - alsa
drwxr-xr-x - oss