Skip to content
Snippets Groups Projects
Commit d014d043 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c
parents 6ec22f9b 6070d81e
No related branches found
No related tags found
Loading
Showing
with 26 additions and 25 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment