summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-05 18:54:51 +0100
committerMark Brown <broonie@kernel.org>2015-06-05 18:54:51 +0100
commit6ba82f91df1f3b57a2339581f5065d178be7e413 (patch)
treeea34aec74b48c4d2fba2a0315c9f4b8f6972fb47 /sound
parent202f5ecb4f0e993ed18a760bfcb707665d1cdd24 (diff)
parent6c219192dd2482eec97f6a7137a5cdc295dc4671 (diff)
parentc778b4726a13ed38f8d36c926b7b0d5144c562de (diff)
parent166070601f6e5d47bd7d3aad9d770a2498d20207 (diff)
parentc682363cec52e0eab82e908be04197e79c5e5006 (diff)
downloadlinux-6ba82f91df1f3b57a2339581f5065d178be7e413.tar.bz2
Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bt-sco', 'asoc/topic/cs35l32' and 'asoc/topic/da7210' into asoc-next