summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:12:21 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 13:12:21 +0000
commit45cbdda46b3c7f225e9c7e48aa72f0479f832ea2 (patch)
tree3fc4c0f6bb70120b8e70dbe52c88005b3e51e5cb /sound/soc
parent6353a4ab42457b4b483331bb3eaa27870e200da0 (diff)
parentc4ee42a050e82855aa06d7217937b1549c95bef3 (diff)
parente03b975506545d21b1daa5c8310b59d66e74919c (diff)
parente8125f04421f7757df0017a59cd9b756148ee769 (diff)
parentc8b5d089d6fd614dfc8a04e3cf087c97486898fb (diff)
downloadkernel-45cbdda46b3c7f225e9c7e48aa72f0479f832ea2.tar.gz
Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/uda134x', 'asoc/topic/uda1380' and 'asoc/topic/wl1273' into asoc-next