diff options
author | Mark Brown <broonie@kernel.org> | 2016-09-29 12:44:49 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-29 12:44:49 -0700 |
commit | 513e43efafe329dad7b5794583b67ac898dcbdca (patch) | |
tree | f383da90a2c72d18c8bf763814c58f5fc588dd5b /include/uapi/sound | |
parent | 84b720f0fec3d50b1b18333c8ecef694eea43b32 (diff) | |
parent | 3cadd224474d60ee06cebafc63db9cd5f8cc47f7 (diff) | |
parent | c3d7abca999ebf09139f59eeab2f294e76017631 (diff) | |
parent | b269cebf72d3591cd889a25f81ead43166a45fb9 (diff) | |
parent | ab387b400872791d0e4d8652a08b44848b85e188 (diff) | |
parent | c7e9426a02699b9f0873e3c2bb383bcb1dd9ab19 (diff) |
Merge remote-tracking branches 'asoc/topic/tpa6130a2', 'asoc/topic/ux500', 'asoc/topic/wm8960', 'asoc/topic/wm8962' and 'asoc/topic/wm8991' into asoc-next