Skip to content
Commit 50de1a8e authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-linus' into for-next 

Conflicts:
	mm/percpu.c
parents 390dfd95 ee0a6efc
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