Git Repo - linux.git/commitdiff

]> Git Repo - linux.git/commitdiff

author	Pekka Enberg <[email protected]>
	Tue, 18 Dec 2012 10:46:20 +0000 (12:46 +0200)
committer	Pekka Enberg <[email protected]>
	Tue, 18 Dec 2012 10:46:20 +0000 (12:46 +0200)

Fix up a trivial merge conflict with commit baaf1dd ("mm/slob: use
min_t() to compare ARCH_SLAB_MINALIGN") that did not go through the slab
tree.

Conflicts:
mm/slob.c

Signed-off-by: Pekka Enberg <[email protected]>

Trivial merge

Empty description

RSS Atom

This page took 0.056387 seconds and 4 git commands to generate.