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
..
2009-06-11 08:51:01 -07:00
2009-05-22 07:30:41 -07:00
2009-05-20 08:30:05 +10:00
2008-06-20 14:05:55 -06:00
2008-12-13 11:25:49 -08:00
2009-06-11 08:51:01 -07:00
2008-10-20 08:52:41 -07:00
2008-12-13 09:12:07 +00:00
2009-06-11 08:51:01 -07:00
2008-07-20 17:12:36 -07:00
2009-04-07 08:31:03 -07:00
2008-06-20 14:05:57 -06:00
2008-12-03 21:04:09 +11:00
2009-01-02 10:28:32 -08:00
2008-06-20 14:05:48 -06:00
2008-02-07 08:42:25 -08:00
2009-06-11 08:51:09 -07:00
2008-04-30 08:29:43 -07:00
2008-07-24 10:47:14 -07:00
2009-06-11 08:51:01 -07:00
2009-01-02 10:19:40 -08:00
2009-01-02 10:19:40 -08:00
2009-06-11 08:51:01 -07:00
2008-07-20 17:12:38 -07:00
2009-06-11 08:50:58 -07:00
2009-01-08 16:44:03 -07:00
2009-02-22 09:23:02 -08:00
2009-06-11 08:51:01 -07:00
2009-01-02 10:19:40 -08:00
2009-03-16 08:34:35 -06:00
2008-07-20 17:12:38 -07:00
2008-06-20 14:05:51 -06:00
2008-04-30 23:15:34 +02:00
2009-06-11 08:51:02 -07:00
2009-06-11 08:51:01 -07:00
2009-06-11 08:51:01 -07:00
2009-06-11 08:51:07 -07:00
2008-10-16 16:52:05 +02:00