summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-26 11:16:20 +0900
committerMark Brown <broonie@kernel.org>2015-10-26 11:16:20 +0900
commitbb9a13a0209c56cdf27d125a1f2f6f34378c64f4 (patch)
tree8f0930c045b210d163873a9d6068ba3ca7e7d51d /include/uapi
parenteee89f5c9ac1fdade9050db5321b9c6fc3496044 (diff)
parent931dfa6931448ccfd12d4ccd8d1d9289ceb92439 (diff)
parent3e2a71b232d6b6270eda72ff659c31c97899c00d (diff)
parentc1fe81f2cd30c18d7df444697bac8051fdf2aee6 (diff)
Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and 'asoc/topic/wm8960' into asoc-next