Skip to content
Commit 9efe21cb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into irq/threaded 

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c
parents de18836e 0221c81b
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