From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 11 Jun 2015 04:52:31 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~113^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4af88a9c1ba2d39263eef003ea598c657014e59e;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

This merges and resolves the non-trivial conflicts with the recent fix
for hda-i915 binding fallback.

Conflicts:
	sound/pci/hda/hda_intel.c

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

4af88a9c1ba2d39263eef003ea598c657014e59e
Reading git-diff-tree failed