author | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 2 Feb 2014 19:30:08 +0000 (11:30 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 2 Feb 2014 19:30:08 +0000 (11:30 -0800) | ||
commit | 7b383bef25e493cc4f047e44ebd6c3ccfd6d1cc5 | |
tree | 4a8379bb6d5929cf72c916da8e5bc7532aa43841 | tree | snapshot (tar.xz tar.gz zip) |
parent | 87af5e5c22568201dfbda5cac9c76e96982adc9c | commit | diff |
parent | cb8ee1a3d429f8898972c869dd4792afb04e961a | commit | diff |
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
Pull SLAB changes from Pekka Enberg:
"Random bug fixes that have accumulated in my inbox over the past few
months"
* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
mm: Fix warning on make htmldocs caused by slab.c
mm: slub: work around unneeded lockdep warning
mm: sl[uo]b: fix misleading comments
slub: Fix possible format string bug.
slub: use lockdep_assert_held
slub: Fix calculation of cpu slabs
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
Pull SLAB changes from Pekka Enberg:
"Random bug fixes that have accumulated in my inbox over the past few
months"
* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
mm: Fix warning on make htmldocs caused by slab.c
mm: slub: work around unneeded lockdep warning
mm: sl[uo]b: fix misleading comments
slub: Fix possible format string bug.
slub: use lockdep_assert_held
slub: Fix calculation of cpu slabs
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
include/linux/slab.h | diff1 | | diff2 | | blob | history |
mm/slub.c | diff1 | | diff2 | | blob | history |