aboutsummaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-26 11:16:08 +0900
committerMark Brown <broonie@kernel.org>2015-10-26 11:16:08 +0900
commit3db5de560ce6d404e9c1377512f2d93245cd048a (patch)
tree1c3ac33cafeb23903ac72c3e1ab795c15b0cfc56 /include/sound
parent8707344edd833738bfdde8ed21bd1a0fd5418015 (diff)
parent218d2ce2036f50d259dbcdd37a4db72cad6fc0d1 (diff)
parent58ceb57ec1be928bec2faeca11fe0752f930669d (diff)
downloadlinux-linaro-stable-3db5de560ce6d404e9c1377512f2d93245cd048a.tar.gz
Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/pxa' into asoc-next