]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a37c458 6e2bdb6)
Merge branch 'slub/cleanups' into slab/next
authorPekka Enberg <penberg@kernel.org>
Mon, 4 Jun 2012 07:14:58 +0000 (10:14 +0300)
committerPekka Enberg <penberg@kernel.org>
Mon, 4 Jun 2012 07:14:58 +0000 (10:14 +0300)
commit861e6d6ac68d8e3e1240d578117ac238ae42192f
tree4e5c9ef6a09d234119a49d2623a0d042fe3af125tree | snapshot
parenta37c45859bb7a3b7a6d3c2dc0a4466159cbaa6fecommit | diff
parent6e2bdb6031580e1d4ebd810f1a3ea49aedf952c4commit | diff
Merge branch 'slub/cleanups' into slab/next

* Fix a merge conflict in mm/slub.c::acquire_slab() due to commit 048a0d4
  ("slub: fix a memory leak in get_partial_node()").

Conflicts:
mm/slub.c

Signed-off-by: Pekka Enberg <penberg@kernel.org>
mm/slub.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.