From: Mark Brown Date: Fri, 12 Apr 2013 12:57:12 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c7df02167854288e20f76915348ffdc9a11e5c2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next --- 8c7df02167854288e20f76915348ffdc9a11e5c2 diff --cc sound/soc/codecs/max98090.c index fc176044994d,ce0d36412c97..ce0d36412c97 mode 100644,100755..100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c