diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-06-26 13:24:42 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-06-26 13:24:42 +0300 |
| commit | 2c92d787cc9fad57d05c96bd117782183768258a (patch) | |
| tree | 51c0c567b8be2fd56073a8ce31f8ebd123a7d562 /include/uapi/linux/mii.h | |
| parent | 145a773aef83181d47ebab21bb33c89233aadb1e (diff) | |
| parent | 8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49 (diff) | |
| download | linux-2c92d787cc9fad57d05c96bd117782183768258a.tar.xz | |
Merge branch 'linus' into x86/entry, to resolve conflicts
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/mii.h')
0 files changed, 0 insertions, 0 deletions