Skip to content
Commit 80c55208 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'cpus4096' into irq/threaded 



Conflicts:
	arch/parisc/kernel/irq.c
	kernel/irq/handle.c

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents b3e3b302 8c083f08
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