Merge branch 'fix/pcm-jiffies-check' into for-linus
authorTakashi Iwai <[email protected]>
Wed, 27 May 2009 14:51:27 +0000 (16:51 +0200)
committerTakashi Iwai <[email protected]>
Wed, 27 May 2009 14:51:27 +0000 (16:51 +0200)
* fix/pcm-jiffies-check:
  ALSA: Enable PCM hw_ptr_jiffies check only in xrun_debug mode
  ALSA: Fix invalid jiffies check after pause


Trivial merge