summaryrefslogtreecommitdiff
path: root/sound/soc/soc-io.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-22 13:22:52 +0100
committerMark Brown <broonie@linaro.org>2014-04-22 13:22:52 +0100
commit2b17ef4071d37ef5e357a4ec75686315cfa9d3e6 (patch)
treea68506b8d4bcc765b5810bf5f5f232228b7dea1c /sound/soc/soc-io.c
parent66097ca7889965e1b85de5cf699d7d728d84f47a (diff)
parent8ab1a06497a1f10ffdcbb8297f0363daaa94e8a4 (diff)
parentab2874a8faac9db00eb03ec831b9a983627fb2d1 (diff)
parent3477501274b79a904a4195b675bb74caa57d2e14 (diff)
parent7a34b1c1dff720dd8dcf63e2b0e5fc15a8f7208f (diff)
Merge branches 'topic/sta350', 'topic/core', 'topic/dapm' and 'topic/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-component