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

Merge branch 'linus' into core/debug 


Conflicts:
	lib/vsprintf.c

Manual merge:

	include/linux/kernel.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents ab7476cf adee14b2
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1630 additions and 149 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