diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:06:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:06:50 +0100 |
| commit | b3bb164aa56018ad8476dd2953b654491b7fb468 (patch) | |
| tree | 781240b23aa2613222aac1aa633a9e4f86a934ec /drivers/isdn | |
| parent | isdn: capi: dead code removal (diff) | |
| parent | Linux 5.5-rc2 (diff) | |
| download | linux-dev-b3bb164aa56018ad8476dd2953b654491b7fb468.tar.xz linux-dev-b3bb164aa56018ad8476dd2953b654491b7fb468.zip | |
Merge 5.5-rc2 into staging-next
We want the staging driver fixes in here, and this resolves merge issues
with the isdn code that was pointed out in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn')
0 files changed, 0 insertions, 0 deletions