diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:00 -0700 |
commit | 7d939fbdfee49e5c06bd27214d25f726fb87a25a (patch) | |
tree | 8366a5e7ec36b3b0162fd54ec4b434a2b840e7ba /kernel | |
parent | 18c98b65279c00c3c983a4525161207f1aa6a04b (diff) | |
parent | 0f389ec63077521166f071e1e970aed36147fd45 (diff) | |
download | kernel_samsung_aries-7d939fbdfee49e5c06bd27214d25f726fb87a25a.zip kernel_samsung_aries-7d939fbdfee49e5c06bd27214d25f726fb87a25a.tar.gz kernel_samsung_aries-7d939fbdfee49e5c06bd27214d25f726fb87a25a.tar.bz2 |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions