Skip to content
GitLab
Commit 0422fe26 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into irq/core, to fix conflict 



Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 4b3ddc64 d1587f7b
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment