tree 02ae68620a40fefd9ffc2de739a8bb362baa3f08
parent 8bf5e36d0429e9b8fc2c84966577f10386bd7195
parent 23774a2f6fee0848503bfb8004eeeb5adef94f5c
author Linus Torvalds <torvalds@linux-foundation.org> 1379243706 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1379243706 -0400

Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

Pull SLAB update from Pekka Enberg:
 "Nothing terribly exciting here apart from Christoph's kmalloc
  unification patches that brings sl[aou]b implementations closer to
  each other"

* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
  slab: Use correct GFP_DMA constant
  slub: remove verify_mem_not_deleted()
  mm/sl[aou]b: Move kmallocXXX functions to common code
  mm, slab_common: add 'unlikely' to size check of kmalloc_slab()
  mm/slub.c: beautify code for removing redundancy 'break' statement.
  slub: Remove unnecessary page NULL check
  slub: don't use cpu partial pages on UP
  mm/slub: beautify code for 80 column limitation and tab alignment
  mm/slub: remove 'per_cpu' which is useless variable