From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 12 Jun 2015 06:10:20 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~113^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc1b76ed32607ba378986931e73b64231085816f;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

Yet another non-trivial conflicts resolution for the recent HD-audio fix.

Conflicts:
	sound/pci/hda/hda_intel.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

cc1b76ed32607ba378986931e73b64231085816f
Reading git-diff-tree failed