projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a304f83
4590685
)
Merge branch 'slab/next' into slab/for-linus
author
Pekka Enberg
<penberg@kernel.org>
Tue, 18 Dec 2012 10:46:20 +0000
(12:46 +0200)
committer
Pekka Enberg
<penberg@kernel.org>
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 <penberg@kernel.org>
Trivial merge