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)
commitb759b3ac9aee3afb01c21b603970ebb200c8048e
tree8a7bc11819410c47d248a3fc27579190853179df
parente28fb9c603f321e0bb4c6c43d58b31de052d6de6
parentf428c94c842343b8580751cf637794050ca12d77
Merge branch 'topic/lola' into for-linus
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/Kconfig