diff options
author | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:29 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:29 +0100 |
commit | 8f90409f91e338fc8b026bffafe7a3877d1a5ac7 (patch) | |
tree | f92b9d8b2520fe035c788a690568dfe4b22945c1 /block/bfq-wf2q.c | |
parent | a641ed5e35dfa1276aa59ba1426d3e6adb0c2823 (diff) | |
parent | c5660778b4851b1aea5d848ccfde3f27949f6418 (diff) | |
parent | db3be255a101da11f67c0f3053b750e767eb10fe (diff) | |
parent | 72a63c6e78887f5c2063ce147b57fdfecf366e0e (diff) |
Merge remote-tracking branches 'asoc/topic/cs35l33', 'asoc/topic/cs35l34' and 'asoc/topic/cs42l42' into asoc-next