From: Takashi Iwai Date: Thu, 10 Sep 2009 13:32:51 +0000 (+0200) Subject: Merge branch 'topic/dummy' into for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6a0f4021469727675b83d85ac91d106bfae0e2c3;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 --- 6a0f4021469727675b83d85ac91d106bfae0e2c3