Merge commit 'alsa/master' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 22 Apr 2009 07:09:29 +0000 (09:09 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 22 Apr 2009 07:09:29 +0000 (09:09 +0200)
* commit 'alsa/master':
  [ALSA] intel8x0: another attempt to fix ac97_clock measure routine
  [ALSA] ac97_codec: increase timeout for analog subsections

1  2 
sound/pci/intel8x0.c

Simple merge