diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-01-08 10:53:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-01-08 10:53:57 +0100 |
| commit | 0422fe2666aea4c0986f4c89dc107731aa6a7a81 (patch) | |
| tree | 1d42a146a738fb933f061424751755e630aeccb0 /drivers/net/ethernet/xilinx/xilinx_emaclite.c | |
| parent | 4b3ddc6462e83452182177b48c4bc53607acd68e (diff) | |
| parent | d1587f7bfe9a0f97a75d42ac1489aeda551106bc (diff) | |
Merge branch 'linus' into irq/core, to fix conflict
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/xilinx/xilinx_emaclite.c')
0 files changed, 0 insertions, 0 deletions