Skip to content
Commit 1503af66 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/header-guards



Conflicts:

	include/asm-x86/gpio.h
	include/asm-x86/ide.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents a3186316 024e8ac0
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