tree c6d7ffd99db592f4b7c294d1a5a7b54284012673
parent f9892a52e2405b4c5fa205d4f18ad292cb7e40bb
parent b888d1ce82ebd2bafecf64c765754968e78b4228
author Takashi Iwai <tiwai@suse.de> 1252589571 +0200
committer Takashi Iwai <tiwai@suse.de> 1252589571 +0200

Merge branch 'topic/dummy' into for-linus

* topic/dummy:
  ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128
  ALSA: dummy - Add debug proc file
  ALSA: Add const prefix to proc helper functions
  ALSA: Re-export snd_pcm_format_name() function
  ALSA: dummy - Fake buffer allocations
  ALSA: dummy - Fix the timer calculation in systimer mode
  ALSA: dummy - Add more description
  ALSA: dummy - Better jiffies handling
  ALSA: dummy - Support high-res timer mode