summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-22 10:24:28 +0100
committerMark Brown <broonie@kernel.org>2015-06-22 10:24:28 +0100
commit95baa281a384b5312ef5884b408e7cc4187b00e6 (patch)
treeab92c42c8c3ded30f4ceaa88136fffa939da96de /sound
parentf79a9db83c6115963d8ece0cebe840db0640f7cf (diff)
parentf9f55e31f8a537b7eaccc4fdb243cff938fa428c (diff)
parent061981ff8cc8793d0e6526b9e1c7476322f566ee (diff)
downloadlinux-95baa281a384b5312ef5884b408e7cc4187b00e6.tar.bz2
Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/atmel' into asoc-next