Merge branch 'topic/lola' into for-linus
Takashi Iwai [Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)]
1  2 
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/Kconfig

Simple merge