From: Takashi Iwai Date: Mon, 22 Jun 2009 15:03:44 +0000 (+0200) Subject: Merge branch 'topic/ctxfi' into for-linus X-Git-Tag: Ubuntu-5.10.0-12.13~32329^2~4 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=366890df46c2fd9492c04fe3a8775447b7b053e4;p=mirror_ubuntu-hirsute-kernel.git Merge branch 'topic/ctxfi' into for-linus * topic/ctxfi: ALSA: ctxfi - Add PM support ALSA: ctxfi - Allow unknown PCI SSIDs --- 366890df46c2fd9492c04fe3a8775447b7b053e4