From: Takashi Iwai Date: Thu, 10 Sep 2009 13:32:48 +0000 (+0200) Subject: Merge branch 'topic/ctxfi' into for-linus X-Git-Tag: v2.6.32-rc1~732^2~16 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/6c5cb93b1e87be56d7f00767fd12cf57852a0b9f?hp=-c Merge branch 'topic/ctxfi' into for-linus * topic/ctxfi: ALSA: ctxfi - Simple code clean up ALSA: ctxfi - Native timer support for emu20k2 --- 6c5cb93b1e87be56d7f00767fd12cf57852a0b9f