diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-25 19:18:00 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-25 19:18:00 +0100 |
commit | a5a3717a980cfa3c8bf194bf302e55b1ab8d6e50 (patch) | |
tree | 79e08e1166e4f5b77f7349f39f659559b54a8585 | |
parent | c64f976208f7f6d16ae0b980f8af42fb18759ace (diff) | |
parent | d3030d11961a8c103cf07aed59905276ddfc06c2 (diff) | |
parent | f7aa23cb8dba96b92f46e47101d360c5e0fa4e3b (diff) | |
parent | b01518ca88410195ace38ce755c1206588e5c167 (diff) | |
parent | 45c04704e467fffe3525205454d9627325dae308 (diff) |
Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/ep93xx', 'asoc/fix/kirkwood' and 'asoc/fix/twl6040' into asoc-linus