tree b8b4d8e9ca3746881639572e3d83602db9c47df9
parent e447360474444466bd405f86e0d3e8e6432c35b6
parent 193b2f65b87e9da78b15f3e3a0cae1d37fbafa57
author Mark Brown <broonie@linaro.org> 1382610239 +0100
committer Mark Brown <broonie@linaro.org> 1382610239 +0100

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