tree ccf2a7808a2f97b09caee74266e1303f76a990d0
parent 42c5c8435e8b7da4684607587d2c882d464cfc7d
parent 8884be98bcfa656febd24bd18fe8bececbf81251
author Linus Torvalds <torvalds@linux-foundation.org> 1250091167 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250091167 -0700

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: hda - Don't override ADC definitions for ALC codecs
  ALSA: hda - Add missing vmaster initialization for ALC269
  ASoC: Add missing DRV_NAME definitions for fsl/* drivers