summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-11-04 12:33:56 -0600
committerMark Brown <broonie@kernel.org>2016-11-04 12:33:56 -0600
commit3dfd2b682b79bde2c4ebbb7ed9f4dc90c0eb4677 (patch)
tree5bd814d6a3744b12cacc717aab234d179783b6b9 /include/uapi
parent74d01b140f52bfe09611361d5c7e6777a6fdadd4 (diff)
parentc975e39ccadf6dc047356c60773a043a2293b8cd (diff)
parenta4513320423a388ed55eb0754353f46b10d05a99 (diff)
parent1e6d304431958929b601b013687b73293ba27b88 (diff)
parent7e235deb69dc7b1c4b5e1ac63a3157ef98ceeff3 (diff)
parent3716a891d65cc04217da1af5f2bccb7eaf6092c2 (diff)
parent8b0678dc914271e9ad4317fe82555ead92ce1cb9 (diff)
Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/samsung', 'asoc/fix/sti', 'asoc/fix/sti-codec', 'asoc/fix/sunxi' and 'asoc/fix/tas571x' into asoc-linus