From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 8 Oct 2013 07:30:04 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~14^2~100
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d820306cbe56fb010f500ae58f9725f49812d39a;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

For updating the HDMI chmap fix.

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

d820306cbe56fb010f500ae58f9725f49812d39a
Reading git-diff-tree failed