tree e01d22012de7694206143b5606f7d51f225eb249
parent cc7889ff5ee7a1c1a2b5073c53db5ad9b76f14e2
parent 1154fab73ccbab010cfaa272b6987c624cfd63c6
author Linus Torvalds <torvalds@linux-foundation.org> 1267828540 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267828540 -0800

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

* 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  SLUB: Fix per-cpu merge conflict
  failslab: add ability to filter slab caches
  slab: fix regression in touched logic
  dma kmalloc handling fixes
  slub: remove impossible condition
  slab: initialize unused alien cache entry as NULL at alloc_alien_cache().
  SLUB: Make slub statistics use this_cpu_inc
  SLUB: this_cpu: Remove slub kmem_cache fields
  SLUB: Get rid of dynamic DMA kmalloc cache allocation
  SLUB: Use this_cpu operations in slub