tree 36d0db8fe389d65bbc8c7aa5be0e61b066f9536a
parent 4496d937a518fde0d0e1980e4ab470cedb4b50cd
parent 15a5b0a4912d98a9615ef457c7bde8d08195a771
author Linus Torvalds <torvalds@linux-foundation.org> 1238109497 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238109497 -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:
  slob: fix lockup in slob_free()
  slub: use get_track()
  slub: rename calculate_min_partial() to set_min_partial()
  slub: add min_partial sysfs tunable
  slub: move min_partial to struct kmem_cache
  SLUB: Fix default slab order for big object sizes
  SLUB: Do not pass 8k objects through to the page allocator
  SLUB: Introduce and use SLUB_MAX_SIZE and SLUB_PAGE_SHIFT constants
  slob: clean up the code
  SLUB: Use ->objsize from struct kmem_cache_cpu in slab_free()