Merge branch 'fix/pcm-jiffies-check' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 27 May 2009 14:51:27 +0000 (16:51 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 27 May 2009 14:51:27 +0000 (16:51 +0200)
commitf5219b619504875a14b63659eecd86098208620c
treef7baac310166bb964f309734d80e1b68a4260752
parentf00452cfdc5ab97208078f06e802b39a4839b7b3
parentc87d9732004b3f8fd82d729f12ccfb96c0df279e
Merge branch 'fix/pcm-jiffies-check' into for-linus

* fix/pcm-jiffies-check:
  ALSA: Enable PCM hw_ptr_jiffies check only in xrun_debug mode
  ALSA: Fix invalid jiffies check after pause