Linus Torvalds 512626a04e 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
2009-06-11 14:15:57 -07:00
..
2008-10-16 11:21:30 -07:00
2009-05-20 10:34:32 +02:00
2008-07-28 14:37:38 +02:00
2007-07-16 09:05:50 -07:00
2009-05-15 07:56:24 -05:00
2009-01-14 18:09:02 +01:00
2008-09-02 19:21:40 -07:00
2009-03-30 22:05:16 +10:30
2008-02-06 10:41:02 -08:00
2009-03-24 10:52:46 +11:00
2009-04-14 17:17:16 +02:00