tree c22e23b0dcc2dd2ff5a9a96a007de6799e9223de
parent 8a1ca8cedd108c8e76a6ab34079d0bbb4f244799
parent 3aa27bbe7a6536d1ec859d3a97caf3319b5081b7
author Linus Torvalds <torvalds@linux-foundation.org> 1244754957 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244754957 -0700

Merge branch 'for-linus' of git://linux-arm.org/linux-2.6

* 'for-linus' of git://linux-arm.org/linux-2.6:
  kmemleak: Add the corresponding MAINTAINERS entry
  kmemleak: Simple testing module for kmemleak
  kmemleak: Enable the building of the memory leak detector
  kmemleak: Remove some of the kmemleak false positives
  kmemleak: Add modules support
  kmemleak: Add kmemleak_alloc callback from alloc_large_system_hash
  kmemleak: Add the vmalloc memory allocation/freeing hooks
  kmemleak: Add the slub memory allocation/freeing hooks
  kmemleak: Add the slob memory allocation/freeing hooks
  kmemleak: Add the slab memory allocation/freeing hooks
  kmemleak: Add documentation on the memory leak detector
  kmemleak: Add the base support

Manual conflict resolution (with the slab/earlyboot changes) in:
	drivers/char/vt.c
	init/main.c
	mm/slab.c