diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-21 23:14:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-21 23:14:47 +0200 |
| commit | 3a26172437bb5ecdf6921e3ae24730ef37d3c860 (patch) | |
| tree | 79b9aee78c58d0138ddf3f5c45ca3fcf35e07958 /include/linux/edd.h | |
| parent | cef62a615d22369d817757d1e4fe64fdf42a401e (diff) | |
| parent | 085b7755808aa11f78ab9377257e1dad2e6fa4bb (diff) | |
Merge 5.1-rc6 into char-misc-next
We want the fixes, and this resolves a merge error in the fastrpc
driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/edd.h')
0 files changed, 0 insertions, 0 deletions