summaryrefslogtreecommitdiffstats
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:11:45 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 13:11:45 +0000
commit0a7e4ca1aad65458edebb718e1b915d1899056e7 (patch)
tree4c9a9c633823a08cfa7dc98fbbec423477f0d086 /sound/soc/Makefile
parent8f38411a7e24b214014db5310af8432dfbef9b18 (diff)
parente874bf5f7647a9fdf14d72dbb376ec95327e3a81 (diff)
parent1b86a3fa4eb3c7a6d738fa21475b92493f8952b1 (diff)
parentde172051af78883a4a2e7897e7af58ba49353b99 (diff)
parentd69db7f7cd57fdfc6ac64c4c8679eb7b80c84fc7 (diff)
Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/topic/adau1373' and 'asoc/topic/adau17x1' into asoc-next