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

Merge branch 'linus' into perfcounters/core 

Conflicts:
	fs/exec.c
	include/linux/init_task.h

Simple context conflicts.
parents 2b583d8b 3c92ec8a
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment