Skip to content
Commit 10d3285d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/urgent' into x86/core 



Conflicts:

	include/asm-x86/gpio.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 6dec3a10 3a61ec38
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