tree cd32701dbbb1be89f7bb34b701e632b348a954e7
parent 821c7de7194e77afee1a69d50830a329a6d9af9f
parent 62e5c4b4d6351707346695fd9e151b6cda85cbe1
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1204585209 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1204585209 -0800

Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm

* 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
  slub: fix possible NULL pointer dereference
  slub: Add kmalloc_large_node() to support kmalloc_node fallback
  slub: look up object from the freelist once
  slub: Fix up comments
  slub: Rearrange #ifdef CONFIG_SLUB_DEBUG in calculate_sizes()
  slub: Remove BUG_ON() from ksize and omit checks for !SLUB_DEBUG
  slub: Use the objsize from the kmem_cache_cpu structure
  slub: Remove useless checks in alloc_debug_processing
  slub: Remove objsize check in kmem_cache_flags()
  slub: rename slab_objects to show_slab_objects
  Revert "unique end pointer" patch
  slab: avoid double initialization & do initialization in 1 place