Skip to content

Commit

Permalink
Merge branch 'slab/common-for-cgroups' into slab/for-linus
Browse files Browse the repository at this point in the history 
Fix up a trivial conflict with NUMA_NO_NODE cleanups.

Conflicts:
	mm/slob.c

Signed-off-by: Pekka Enberg <[email protected]>
  • Loading branch information
@penberg
penberg committed Oct 3, 2012
2 parents 023dc70 + f28510d commit f4178cd
Show file tree
Hide file tree
Showing 5 changed files with 280 additions and 277 deletions.
Loading

0 comments on commit f4178cd

Please sign in to comment.