tree 29d072381c7712dd1b4176af28771e5e38883cfa
parent 23e041dbaa80eb1032f9d612433c6b9062da5afd
parent 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09
author Linus Torvalds <torvalds@linux-foundation.org> 1259618120 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1259618120 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: AACI: fix recording bug
  ALSA: AACI: fix AC97 multiple-open bug
  ASoC: AIC23: Fixing infinite loop in resume path
  ASoC: Fix suspend with active audio streams