summaryrefslogtreecommitdiff
path: root/sound/soc/intel/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-15 12:51:29 +0100
committerMark Brown <broonie@linaro.org>2014-08-15 12:51:29 +0100
commit7c063edee6855a2489f995578f6c7a4ab0ddfe07 (patch)
tree99ebc9209d723f3b8b0b78a34a2ff57d8eecdf3a /sound/soc/intel/Makefile
parent395d33bb16576ecfffd07c2ed2dfc7624e75f48a (diff)
parentd114e5f73b1191a6c323eb1f25fd5084db6539cc (diff)
parentdc85950a1a176c49f33ad9c6499f7b6a61e85925 (diff)
parent769091ee18056b3aa35b415d9768fb23f361e598 (diff)
parentb80d19c166c4f086eefa05308ab0cb28e43c4ca2 (diff)
parent8813543ecb405f3ea29be8dfa1f85afc6e06a544 (diff)
parent9301503af016eb537ccce76adec0c1bb5c84871e (diff)
Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl', 'asoc/fix/fsl-esai', 'asoc/fix/intel', 'asoc/fix/mcasp' and 'asoc/fix/pxa' into asoc-linus