Skip to content
GitLab
Commit 32032df6 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'master' into percpu 

Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h
parents 22b737f4 c5974b83
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
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