summaryrefslogtreecommitdiff
path: root/fs/minix
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-01 14:02:07 +0100
committerMark Brown <broonie@linaro.org>2014-06-01 14:02:07 +0100
commit287d414eacaa681413ea89adfa5b3a0d12d2ab1a (patch)
treea4ef6c55bc2b2177f8a4144663c68e6e345b64cc /fs/minix
parent432481220101166a0b33dc6f951b38a8af3d281c (diff)
parent7b8751abdd34a2f924c37c29ad61d598f5d29e7b (diff)
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi
Conflicts: sound/soc/fsl/Kconfig
Diffstat (limited to 'fs/minix')
0 files changed, 0 insertions, 0 deletions