Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-sai', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
commiteb2d8ec37fadb272dae7f1e6c93abf03fec8e3e3
treeaa48d00eb4e83b5ebb57a31377301a2dc210206e
parent698803f8b9cec4e224bc344f7120f70246457ae0
parent0f9a7fecf2514cd5cb14be8e9aae3556c403ff1f
parentc5f4823babfd5e1b34494310e0a9f7cab44cadb9
parentf490f326178a6fec87a9bc3d35525bc9cb96ef0e
parentff9174d57a8239c5a21d2a0c7e00dddd54953f6c
parente616d2eba6d1ac8f3268cdf5d7b0424072c89a8d
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-sai', 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi' and 'asoc/topic/gpio-jack' into asoc-next
sound/soc/fsl/fsl_sai.c
sound/soc/fsl/fsl_ssi.c