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

Merge branch 'linus' into cpus4096-for-linus 



Conflicts:

	net/sunrpc/svc.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents c4762aba 14b395e3
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