git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f8f5701
57d437d
)
Merge branch 'slub/cleanups' into slab/next
author
Pekka Enberg
<penberg@kernel.org>
Mon, 4 Jun 2012 07:14:58 +0000
(10:14 +0300)
committer
Pekka Enberg
<penberg@kernel.org>
Mon, 4 Jun 2012 07:14:58 +0000
(10:14 +0300)
* Fix a merge conflict in mm/slub.c::acquire_slab() due to commit 02d7633
("slub: fix a memory leak in get_partial_node()").
Conflicts:
mm/slub.c
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff