Merge branch 'topic/ctxfi' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:48 +0000 (15:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:48 +0000 (15:32 +0200)
commit6c5cb93b1e87be56d7f00767fd12cf57852a0b9f
tree69fb247d92d1130c2151312d36e1917fcc6b7481
parentf604529d0c1c24be025f47b591366e257ee75f66
parent35ebf6e7210dc0f7c612856513a8489a1da9de7e
Merge branch 'topic/ctxfi' into for-linus

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