summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 14:13:06 +0300
committerMark Brown <broonie@kernel.org>2017-09-01 14:13:06 +0300
commit2e9ac12a00f1de285fc6fd77b9c9949b4bd7283f (patch)
tree9820f6aa1fffd0905d89de87764a86d2efba7ed1 /include/sound
parent55eafeb5cdbd5d7440f5532ebf13d49edc66316b (diff)
parenta728f56094e7cf60a1dc0642fe86901d1a4dfb4e (diff)
parenta1150d40b219af1344f7bcc9b365dc5ec7bfbb65 (diff)
parentc5efe232e09ef29cc2f9e8333a49dd8891366c22 (diff)
parent635eac1e54d82c59f621a0f38a9bffae50f150c7 (diff)
parent7d2993811a1e07cd128847f07f63aae66a78d14b (diff)
downloadlinux-2e9ac12a00f1de285fc6fd77b9c9949b4bd7283f.tar.xz
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic/sta32x', 'asoc/topic/stm32' and 'asoc/topic/sunxi' into asoc-next