From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 21 Mar 2013 20:38:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
X-Git-Tag: next-20130322~58^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2d0bcfe22060eae498090a4dfccb1c3c0cde8ea;p=karo-tx-linux.git

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

f2d0bcfe22060eae498090a4dfccb1c3c0cde8ea
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