commit 151b6a5f1d4c547c92ec67a5a6fedc16f435956e
author Linus Torvalds <torvalds@linux-foundation.org> Fri Sep 17 10:53:28 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Sep 17 10:53:28 2010 -0700
tree 5718e5d1a545b0fd11119277cc9ad6d4202cd1e7
parent 509344b8b4d365b7ff3bce97198d83a57b7c3f31
parent a1984f49996aa1553c7dbf5e1abb785a6d378bd4

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 - Fix race with proc files
  ALSA: pcm - Fix unbalanced pm_qos_request
  ALSA: HDA: Enable internal speaker on Dell M101z
  ALSA: patch_nvhdmi.c: Fix supported sample rate list.
  sound: Remove pr_<level> uses of KERN_<level>
  ALSA: hda - Add quirk for Toshiba C650D using a Conexant CX20585
  ALSA: hda_intel: ALSA HD Audio patch for Intel Patsburg DeviceIDs