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

Merge branch 'linus' into cpus4096 

Conflicts:
	kernel/trace/ring_buffer.c
parents 1c391948 061e41fd
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