commit bd27e6d3d27ce1485a64a4851c4dcf58e663b132
author Linus Torvalds <torvalds@linux-foundation.org> Wed Mar 18 07:39:11 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Mar 18 07:39:11 2009 -0700
tree 683704f98b330a066c3892fa12d855ad916a0f49
parent 58cefd2b1e062147502302179503dc51907426d1
parent f1aa2986795387ff785d1c13ad9cb9159b202e87

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: Fix vunmap and free order in snd_free_sgbuf_pages()
  ALSA: mixart, fix lock imbalance
  ALSA: pcm_oss, fix locking typo
  ALSA: oss-mixer - Fixes recording gain control
  ALSA: hda - Workaround for buggy DMA position on ATI controllers
  ALSA: hda - Fix DMA mask for ATI controllers
  ALSA: opl3sa2 - Fix NULL dereference when suspending snd_opl3sa2