Skip to content
Commit 2c5cb277 authored by David Vrabel's avatar David Vrabel
Browse files

Merge commit '683b6c6f' into stable/for-linus-3.15 

This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.

Conflicts:
	drivers/xen/events/events_base.c
parents cd979883 683b6c6f
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