From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2008 15:19:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Tag: v2.6.26-rc1~1159
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7d939fbdfee49e5c06bd27214d25f726fb87a25a;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: No need for per node slab counters if !SLUB_DEBUG
  slub: Move map/flag clearing to __free_slab
  slub: Fixes to per cpu stat output in sysfs
  slub: Deal with config variable dependencies
  slub: Reduce #ifdef ZONE_DMA by moving kmalloc_caches_dma near dma logic
  slub: Initialize per-cpu stats
---

7d939fbdfee49e5c06bd27214d25f726fb87a25a