Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 19 Apr 2009 09:40:02 +0000 (11:40 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 19 Apr 2009 09:40:02 +0000 (11:40 +0200)
commitd6aa764ee8674512287913fcc3a0b1b5c050d5eb
tree0cb4a8f6d6cd6f649e705dce6390fa99afc859e0
parent81584a079fc7a18b53fc7db4232419a8faadd414
parent3126a1790e897252868941bd29a3dd526b506804
Merge branch 'fix/misc' into for-linus

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