Skip to content
Commit 22796b15 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/header-fixes' into x86/headers 

Conflicts:
	arch/x86/include/asm/setup.h
parents bf33a70a 0fb807c3
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