From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 22 Jun 2009 15:03:44 +0000 (+0200)
Subject: Merge branch 'topic/ctxfi' into for-linus
X-Git-Tag: v2.6.31-rc1~38^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=366890df46c2fd9492c04fe3a8775447b7b053e4;p=linux.git

Merge branch 'topic/ctxfi' into for-linus

* topic/ctxfi:
  ALSA: ctxfi - Add PM support
  ALSA: ctxfi - Allow unknown PCI SSIDs
---

366890df46c2fd9492c04fe3a8775447b7b053e4