diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:43:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:43:50 +0200 |
| commit | 422d2245136a2c49550dc83ca9735dd4d8ea71f7 (patch) | |
| tree | 8dc42f707efcce275baba950be2076ec830f52f4 /net/hsr/hsr_slave.h | |
| parent | b0077b4b085f636e5f8a1fd9cd6e568907471b24 (diff) | |
| parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
Merge 5.12-rc6 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/hsr/hsr_slave.h')
0 files changed, 0 insertions, 0 deletions