Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/atmel', 'asoc/fix/cs4271...
authorMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:22 +0000 (19:48 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:22 +0000 (19:48 +0100)
commit250acc709ee23856eba8432f979e42ba64a9a8b6
treeb96979879c1b368d077690af5ee2882eb97e7073
parenta37a9407ca3cec1f9218657eaec43814db1673f6
parentc01673e0b7236140eb5bbe1c7b30aa262f142d7e
parent3a82002c7cbb166b891de515b5463aec41035c75
parent74ff960222d90999508b4ba0d3449f796695b6d5
parenta57069e33fbc6625f39e1b09c88ea44629a35206
parent2f78dd7f40264697afed4c2ac0890df8f0588e49
Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/atmel', 'asoc/fix/cs4271', 'asoc/fix/davinci' and 'asoc/fix/rcar' into asoc-linus
MAINTAINERS
sound/soc/codecs/cs4271.c
sound/soc/sh/rcar/core.c