Merge branch 'topic/lola' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)
1  2 
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/Kconfig

Simple merge