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

Merge branch 'for-ingo' of... 

Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 into tracing/kmemtrace

Conflicts:
	mm/slub.c
parents 64b36ca7 fe1200b6
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