From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 10 Jun 2009 05:26:41 +0000 (+0200)
Subject: Merge branch 'topic/pcm-jiffies-check' into for-linus
X-Git-Tag: v2.6.31-rc1~363^2~13
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b88bc522986ae853670fcba71bb3761c84f7867;p=karo-tx-linux.git

Merge branch 'topic/pcm-jiffies-check' into for-linus

* topic/pcm-jiffies-check:
  ALSA: pcm - A helper function to compose PCM stream name for debug prints
  ALSA: pcm - Fix update of runtime->hw_ptr_interrupt
  ALSA: pcm - Fix a typo in hw_ptr update check
  ALSA: PCM midlevel: lower jiffies check margin using runtime->delay value
  ALSA: PCM midlevel: Do not update hw_ptr_jiffies when hw_ptr is not changed
  ALSA: PCM midlevel: introduce mask for xrun_debug() macro
  ALSA: PCM midlevel: improve fifo_size handling
---

3b88bc522986ae853670fcba71bb3761c84f7867