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

Merge branch 'for-linus' into for-next

Yet another non-trivial conflicts for HDA legacy stuff.

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

0b2d71175990629f11189f5df98cc0c26ae61993
Reading git-diff-tree failed