Merge branch 'topic/lola' into for-linus
[pandora-kernel.git] / sound / pci / Kconfig
Simple merge