diff options
author | Mark Brown <broonie@kernel.org> | 2016-08-24 19:05:22 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-08-24 19:05:22 +0100 |
commit | e8f0f8aa4eb356bd729f15be8827db2558ea1ae6 (patch) | |
tree | 1330704c659bd8081df321958453dbb306f8aff8 /sound | |
parent | d520519518de1423c1a7b7df1a008e58e33de9f8 (diff) | |
parent | 3e103a65514c2947e53f3171b21255fbde8b60c6 (diff) | |
parent | b0f12c61de013ecb0abe19d5e64bdab45989de5a (diff) | |
parent | 5d764912a0ee6db83e962c1501b5b9e58ba14e15 (diff) | |
parent | d1e81428826221d7ff8e4d83db784d099cd232a7 (diff) |
Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/da7213' and 'asoc/fix/debugfs' into asoc-linus