diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 10:08:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 10:08:03 -0400 |
commit | de7ba0574e5f771bb56ce3c075b9975d9d2ba0f6 (patch) | |
tree | 4ee4f92476657a92e6228b13a6fffb27c4d25f06 /sound | |
parent | d7963b72e4f7c41f741dbf75003f9ca23eac6512 (diff) | |
parent | 4480764f57ba494e3f64003e13223c0b5ec6a2ca (diff) |
Merge remote-tracking branch 'asoc/fix/max98090' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--[-rwxr-xr-x] | sound/soc/codecs/max98090.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | sound/soc/codecs/max98090.h | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index fc176044994d..fc176044994d 100755..100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c | |||
diff --git a/sound/soc/codecs/max98090.h b/sound/soc/codecs/max98090.h index 7e103f249053..7e103f249053 100755..100644 --- a/sound/soc/codecs/max98090.h +++ b/sound/soc/codecs/max98090.h | |||