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)
commit248e88247a0e03125a663be69f2656d2e158371e
tree8795079c01733086b18cf0e995dbd9892ca328f6
parentbc8d489c44e05fae469f63b40c0da0718dba6798
parent30fd9940eee910d847f48bd8740b2d0eaa8d2cfc
Merge commit 'alsa/master' into for-linus

* commit 'alsa/master':
  [ALSA] intel8x0: another attempt to fix ac97_clock measure routine
  [ALSA] ac97_codec: increase timeout for analog subsections
sound/pci/intel8x0.c