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)
* fix/misc:
  ALSA: MAINTAINERS - Update SOUND
  ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge