summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-23 14:00:55 +0000
committerMark Brown <broonie@linaro.org>2014-03-23 14:00:55 +0000
commit980aac20877e428406959391e6cb6b8dc3243ad2 (patch)
tree47c62f3fb21281585905da76189f56e874d390fc /sound
parentcca1b08ff6996c41a4467d79977cecd3f49dd0a5 (diff)
parente585ca342dbbfe7102985d9ed4eae3f9e1d77ced (diff)
parent7f0af4ae86110c46b43fb57f2e0002aa81ca6a67 (diff)
Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc-next