Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 8 Oct 2013 07:30:04 +0000 (09:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 8 Oct 2013 07:30:04 +0000 (09:30 +0200)
For updating the HDMI chmap fix.

Conflicts:
sound/pci/hda/patch_hdmi.c


Trivial merge