]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6fbb82b e0b4d86)
Merge branch 'slab/next' into slab/for-linus
authorPekka Enberg <penberg@kernel.org>
Tue, 18 Dec 2012 10:46:20 +0000 (12:46 +0200)
committerPekka Enberg <penberg@kernel.org>
Tue, 18 Dec 2012 10:46:20 +0000 (12:46 +0200)
commit5114c3bad9abc41229bfb9e1b925b152c3390670
tree875d203149b74fddb50522fd5df3d6b154f5fe1etree | snapshot
parent6fbb82bce7d5806c5ecbf4cfc803c1ac2709a538commit | diff
parente0b4d86a3293173f75d57f7f6af75949d82748aacommit | diff
Merge branch 'slab/next' into slab/for-linus

Fix up a trivial merge conflict with commit 2c07c15 ("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 <penberg@kernel.org>
Linux Kernel Source Tree.