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)
commitf68d891d85c8f9ab1af663ed3ceac18ad58dbabe
treed92db7af512307ab5282eb62f3dd1741ac71d21f
parent5780b627e24113323427c102175296ae43dfb9d7
parent3fd877d32cac31292628fb8f443543fc1989b49b
Merge branch 'topic/hda-beep' into topic/hda
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_intel.c