Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/pxa' into asoc...
authorMark Brown <broonie@kernel.org>
Mon, 26 Oct 2015 02:16:08 +0000 (11:16 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 26 Oct 2015 02:16:08 +0000 (11:16 +0900)
commit3db5de560ce6d404e9c1377512f2d93245cd048a
tree1c3ac33cafeb23903ac72c3e1ab795c15b0cfc56
parent8707344edd833738bfdde8ed21bd1a0fd5418015
parent218d2ce2036f50d259dbcdd37a4db72cad6fc0d1
parent58ceb57ec1be928bec2faeca11fe0752f930669d
Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/pxa' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile