summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm5100.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:55:41 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:55:41 +0100
commitd781c23e9b46f33c1c6c07febae36f37a11f9d4d (patch)
tree77361cc997cb7fc6f199ed0b20a4ee2b7da0659f /sound/soc/codecs/wm5100.c
parentacb47ad5023fbd29a2c9a681c28b33968c9dcc9e (diff)
parent42d1b8ce2973c2f5956f4d4e4af002986ccc5748 (diff)
parent637c4497bbf0c9a4e00d6be2731bd560bf609f6b (diff)
parent618718dc56a49321a12f231b34f6c43f44c3c374 (diff)
downloadlinux-d781c23e9b46f33c1c6c07febae36f37a11f9d4d.tar.bz2
Merge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next