Merge branch 'topic/pcm-jiffies-check' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2009 18:03:15 +0000 (20:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2009 18:03:15 +0000 (20:03 +0200)
* topic/pcm-jiffies-check:
  ALSA: pcm - Update document about xrun_debug proc file


Trivial merge