Forum | Documentation | Website | Blog

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

Merge branch 'tip/perf/core-2' of... 

Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Conflicts:
	Makefile
parents b4f9f2b6 0ef5bf1c
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 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

Open hardware computers for makers, educators and professionals