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)
commitd820306cbe56fb010f500ae58f9725f49812d39a
tree1c9554107c7f279d05d6f54b1b5d69735d51195d
parent6d5eba5aac4ec9bba3d6b3e6425d857706d12ccb
parent39edac70e9aedf451fccaa851b273ace9fcca0bd
Merge branch 'for-linus' into for-next

For updating the HDMI chmap fix.

Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_hdmi.c