tree 8795079c01733086b18cf0e995dbd9892ca328f6
parent bc8d489c44e05fae469f63b40c0da0718dba6798
parent 30fd9940eee910d847f48bd8740b2d0eaa8d2cfc
author Takashi Iwai <tiwai@suse.de> 1240384169 +0200
committer Takashi Iwai <tiwai@suse.de> 1240384169 +0200

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