Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
Loading
Showing
with 1368 additions and 369 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment