Skip to content
Commit 6c5cb93b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/ctxfi' into for-linus 

* topic/ctxfi:
  ALSA: ctxfi - Simple code clean up
  ALSA: ctxfi - Native timer support for emu20k2
parents f604529d 35ebf6e7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment