tree 69fb247d92d1130c2151312d36e1917fcc6b7481
parent f604529d0c1c24be025f47b591366e257ee75f66
parent 35ebf6e7210dc0f7c612856513a8489a1da9de7e
author Takashi Iwai <tiwai@suse.de> 1252589568 +0200
committer Takashi Iwai <tiwai@suse.de> 1252589568 +0200

Merge branch 'topic/ctxfi' into for-linus

* topic/ctxfi:
  ALSA: ctxfi - Simple code clean up
  ALSA: ctxfi - Native timer support for emu20k2