From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 12 Apr 2013 12:57:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8c7df02167854288e20f76915348ffdc9a11e5c2;p=linux-edison.git

Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
---

8c7df02167854288e20f76915348ffdc9a11e5c2
diff --cc sound/soc/codecs/max98090.c
index fc176044994,ce0d36412c9..ce0d36412c9
mode 100644,100755..100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c