summaryrefslogtreecommitdiff
path: root/include/uapi/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 15:53:21 +0000
committerMark Brown <broonie@kernel.org>2016-12-12 15:53:21 +0000
commitda644e2edea7e3b03f4a9df15d9125902b52c804 (patch)
tree50356353f6a13cae04a30be992f91505885e30e5 /include/uapi/sound
parentf617134f75bc52cd59bed0b0d43d8fa7fece689e (diff)
parent7aacbc7ff7f6da9ec6deb833154f0883497ab82f (diff)
parent4db61af068f50948a41b32a32fc3361f7ad152df (diff)
parent92591efabc013fa791f96df881aafcc104ba759d (diff)
parent4a15b24a65f13778f7616ad0a65be78d8ec0b45a (diff)
parent8a7a282b780154c2669ce7d4f47a15bf3d287d49 (diff)
Merge remote-tracking branches 'asoc/topic/stac9766', 'asoc/topic/sti', 'asoc/topic/sti-codec', 'asoc/topic/sunxi' and 'asoc/topic/tegra' into asoc-next