Skip to content
GitLab
Commit 462b69b1 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into irq/core to get the GIC updates which 

conflict with pending GIC changes.

Conflicts:
	drivers/usb/isp1760/isp1760-core.c
parents d8bf368d f22e6e84
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