Skip to content
Snippets Groups Projects
Commit 5e344378 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into core/softlockup 

Conflicts:
	kernel/sysctl.c
parents 77d05632 d508afb4
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1342 additions and 922 deletions
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