]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f8f5701 57d437d)
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)
commit23910c50cced8f35d53e4f8ea0cc09ad58d286af
tree4e5c9ef6a09d234119a49d2623a0d042fe3af125tree | snapshot
parentf8f5701bdaf9134b1f90e5044a82c66324d2073fcommit | diff
parent57d437d2aa680f42d75cef45205834d5f605550acommit | diff
Merge branch 'slub/cleanups' into slab/next

* 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>
mm/slub.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules