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

Merge commit '63cc8c75': 



  "percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro"

into x86/core

Conflicts:
	arch/x86/kernel/cpu/common.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 90427638 63cc8c75
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