Skip to content
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
Hide whitespace changes
Inline Side-by-side
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