diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-25 16:25:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-25 16:25:07 +0100 |
| commit | dc9617cb81c4130858b6dd026039f42a39e93c18 (patch) | |
| tree | 533411a51837673616da0cf5212fa18c7de3e3a3 /include/linux/trace_seq.h | |
| parent | 6e4cac23c5a648d50b107d1b53e9c4e1120c7943 (diff) | |
| parent | b6e38b2944f1153199becefb14ae3ee01778863e (diff) | |
| parent | d05d862ead8eca5e7d4ccf82d39d9189579ee5b1 (diff) | |
Merge remote-tracking branches 'asoc/fix/intel', 'asoc/fix/topology' and 'asoc/fix/sti' into asoc-linus