diff options
author | Mark Brown | 2018-05-01 23:12:18 +0200 |
---|---|---|
committer | Mark Brown | 2018-05-01 23:12:18 +0200 |
commit | 783ec5e99ab9d8839957b15b5836e8bb795d74b6 (patch) | |
tree | 3b25befe45a3cbf67692fc388da49929f9bfaa85 /fs/pipe.c | |
parent | ASoC: amd: fix spelling mistake: "failer" -> "failure" (diff) | |
parent | ASoC: dai playback and capture active may be greater than 1 (diff) | |
download | kernel-qcow2-linux-783ec5e99ab9d8839957b15b5836e8bb795d74b6.tar.gz kernel-qcow2-linux-783ec5e99ab9d8839957b15b5836e8bb795d74b6.tar.xz kernel-qcow2-linux-783ec5e99ab9d8839957b15b5836e8bb795d74b6.zip |
Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a
conflict between a fix and new development in mtk
Diffstat (limited to 'fs/pipe.c')
0 files changed, 0 insertions, 0 deletions