commit 7c5814c7199851c5fe9395d08fc1ab3c8c1531ea
author Linus Torvalds <torvalds@linux-foundation.org> Wed Oct 27 18:52:49 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Oct 27 18:52:49 2010 -0700
tree 66cc9080e47c0be8bd9d4530626e54c77f9895ed
parent a042e26137d7674ac04b1cd2d5c06b9ebc1ee2d5
parent 89e1e66d6be8a520cdcd26043cda2cc870a34015

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: usb-audio: automatically detect feedback format
  ASoC: sound/wm9090: add missing __devexit marker
  ASoC: sound/max98088: add missing __devexit marker
  ASoC: sound/ad73311: add missing __devexit marker
  ASoC: fsl - fix build error in pcm030-audio-fabric.c
  sound/oss/sb_ess.c: delete double assignment
  ALSA: hda - Change BTL amp level on some HP notebooks