Merge branch 'topic/hda-beep' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 4 Jul 2012 07:12:50 +0000 (09:12 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 4 Jul 2012 07:12:50 +0000 (09:12 +0200)
1  2 
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_intel.c

Simple merge
Simple merge