tree 8366a5e7ec36b3b0162fd54ec4b434a2b840e7ba
parent 18c98b65279c00c3c983a4525161207f1aa6a04b
parent 0f389ec63077521166f071e1e970aed36147fd45
author Linus Torvalds <torvalds@linux-foundation.org> 1208531940 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1208531940 -0700

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