ef4f79142048b9363adff55575bc1f
parent eda58a85ec3fc05855a26654d97a2b53f0e715b9
parent 7df0eb424d7f5bfb948c921500e0470f4a27c4cb
author Linus Torvalds <torvalds@linux-foundation.org> 1233769152 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233769152 -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: pcm_oss: AFMT_S24_LE is set twice in return value
  ALSA: ASoC: email - update email addresses.
  OMAP: ASoC: Fix spinlock misuse in omap-pcm.c
  ALSA: hda - No widget selection for volume knob widgets in proc output
  ALSA: hda - Add support of iMac 24 Aluminium
  ALSA: alsa: time reaches -1, tested 0
  ALSA: hda - Add quirk for another HP dv5 model
(ø=“