From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 12 Jan 2010 08:40:08 +0000 (+0100)
Subject: Merge commit alsa/devel into topic/misc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a29fb94ff48cba620e1ac1317f5eef5920ead3ff;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge commit alsa/devel into topic/misc

Conflicts:
	include/sound/version.h
---

a29fb94ff48cba620e1ac1317f5eef5920ead3ff