Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda
Takashi Iwai [Wed, 2 Jun 2010 12:15:10 +0000 (14:15 +0200)]
1  2 
sound/pci/hda/hda_intel.c

Simple merge