]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 25457c0 7a59561)
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)
commit81056db1647ee94225d28a7374cc8c3e22aba100
tree875d203149b74fddb50522fd5df3d6b154f5fe1etree | snapshot
parent25457c09d13628c9c89012573d11f745bb77c320commit | diff
parent7a59561c0c4cf165f18e36f9431623aa7bf62ed9commit | diff
Merge branch 'slab/next' into slab/for-linus

Fix up a trivial merge conflict with commit ce732ca ("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.