From: Takashi Iwai Date: Tue, 16 Jun 2015 10:47:34 +0000 (+0200) Subject: Merge branch 'for-linus' into for-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b2d71175990629f11189f5df98cc0c26ae61993;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'for-linus' into for-next Yet another non-trivial conflicts for HDA legacy stuff. Signed-off-by: Takashi Iwai --- 0b2d71175990629f11189f5df98cc0c26ae61993