Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 18 Mar 2013 10:04:42 +0000 (11:04 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 18 Mar 2013 10:04:42 +0000 (11:04 +0100)
commitcf30f46acde1f84fbf603bba6540cbb40cc6c954
tree2652b3fd1fbc4c379ee5325579fe60eae75421f1
parent0959f22ee66734c212fc733f7616ba321ef7f47f
parenta86b1a2cd2f81f74e815e07f756edd7bc5b6f034
Merge branch 'for-linus' into for-next

Back-merged for refactoring beep stuff.
sound/core/vmaster.c
sound/pci/hda/hda_codec.c
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c