tree 0cb4a8f6d6cd6f649e705dce6390fa99afc859e0
parent 81584a079fc7a18b53fc7db4232419a8faadd414
parent 3126a1790e897252868941bd29a3dd526b506804
author Takashi Iwai <tiwai@suse.de> 1240134002 +0200
committer Takashi Iwai <tiwai@suse.de> 1240134002 +0200

Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: MAINTAINERS - Update SOUND
  ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()