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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: pack objects denser
  slub: Calculate min_objects based on number of processors.
  slub: Drop DEFAULT_MAX_ORDER / DEFAULT_MIN_OBJECTS
  slub: Simplify any_slab_object checks
  slub: Make the order configurable for each slab cache
  slub: Drop fallback to page allocator method
  slub: Fallback to minimal order during slab page allocation
  slub: Update statistics handling for variable order slabs
  slub: Add kmem_cache_order_objects struct
  slub: for_each_object must be passed the number of objects in a slab
  slub: Store max number of objects in the page struct.
  slub: Dump list of objects not freed on kmem_cache_close()
  slub: free_list() cleanup
  slub: improve kmem_cache_destroy() error message
  slob: fix bug - when slob allocates "struct kmem_cache", it does not force alignment.

diff --cc include/linux/mm_types.h
Simple merge

diff --cc mm/slub.c
index 38914bc64aca2cd58a4c40e35b1b8ef45b9e55d9,d821ce6fff39b1872c2f8c8b42ed44f656c7fbc0..992ecd4f0d393c748dceec95e3ddd714b16557b4
--- 1/mm/slub.c
--- 2/mm/slub.c
+++ b/mm/slub.c
@@@ -204,9 -185,12 +185,7 @@@ static inline void ClearSlabDebug(struc
  /* Internal SLUB flags */
  #define __OBJECT_POISON               0x80000000 /* Poison object */
  #define __SYSFS_ADD_DEFERRED  0x40000000 /* Not yet visible via sysfs */
- #define __KMALLOC_CACHE               0x20000000 /* objects freed using kfree */
- #define __PAGE_ALLOC_FALLBACK 0x10000000 /* Allow fallback to page alloc */
  
 -/* Not all arches define cache_line_size */
 -#ifndef cache_line_size
 -#define cache_line_size()     L1_CACHE_BYTES
 -#endif
 -
  static int kmem_size = sizeof(struct kmem_cache);
  
  #ifdef CONFIG_SMP