summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-26 11:16:00 +0900
committerMark Brown <broonie@kernel.org>2015-10-26 11:16:00 +0900
commit7034ef5f604a9e92dd80d042cb3f64d4b1f22375 (patch)
tree30ec9d1eb571f9a6e561a114ef5261bc5ce5a7bb /sound
parent2c218b7434205d2151118bd66832d73fb85e36ae (diff)
parent391ac3ef50b9ec575c4d5c6f055efe5096ac1957 (diff)
parent955da48532f6d6254cca38f6f247ddeee1ebd722 (diff)
Merge remote-tracking branches 'asoc/topic/atmel-classd' and 'asoc/topic/da7213' into asoc-next