Merge branch 'for-linus' into for-next

Back-merged for refactoring beep stuff.

diff --cc sound/core/vmaster.c
Simple merge

diff --cc sound/pci/hda/hda_codec.c
Simple merge

diff --cc sound/pci/hda/patch_conexant.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge