summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-02-07 11:25:41 +0000
committerMark Brown <broonie@kernel.org>2018-02-07 11:25:41 +0000
commit535b218a7fc7f2918d54fe00e6d7ac385ced3502 (patch)
tree5179fe8e6c0905eeb5132a64588978bcaf929fcf /include/sound
parent008a03c0cfac809661e935c7128fa51633f6c250 (diff)
parent03bbf9f5e4eb9944511cd218d3c1b18809d12eb2 (diff)
parent971da24c48a9447fb7a3c7805812fd5f443ca008 (diff)
parent35b84bf0614a7da98bfbbac70ed3d01c3b5b6c58 (diff)
parentf7f61e08fe5840ca43baa49355b40d3aede1ac97 (diff)
Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/core', 'asoc/topic/dmic' and 'asoc/topic/intel' into asoc-next