tree eadf0bfa385dad2e76a27d9a01cdcb22bad0efc1
parent cead99dcf48eeaaac0a1ececff9c979756b79294
parent 331dc558fa020451ff773973cee855fd721aa88e
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203053042 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203053042 -0800

Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm

* 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
  slub: Support 4k kmallocs again to compensate for page allocator slowness
  slub: Fallback to kmalloc_large for failing higher order allocs
  slub: Determine gfpflags once and not every time a slab is allocated
  make slub.c:slab_address() static
  slub: kmalloc page allocator pass-through cleanup
  slab: avoid double initialization & do initialization in 1 place