From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 3 Mar 2008 23:00:09 +0000 (-0800)
Subject: Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
X-Git-Tag: v2.6.25-rc4~107
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=976dde010e513a9c7c3117a32b7b015f84b37430;p=linux-2.6-omap-h63xx.git

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
---

976dde010e513a9c7c3117a32b7b015f84b37430