Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6
Linus Torvalds [Fri, 18 Dec 2009 00:00:19 +0000 (16:00 -0800)]
* 'kmemleak' of git://linux-arm.org/linux-2.6:
  kmemleak: fix kconfig for crc32 build error
  kmemleak: Reduce the false positives by checking for modified objects
  kmemleak: Show the age of an unreferenced object
  kmemleak: Release the object lock before calling put_object()
  kmemleak: Scan the _ftrace_events section in modules
  kmemleak: Simplify the kmemleak_scan_area() function prototype
  kmemleak: Do not use off-slab management with SLAB_NOLEAKTRACE

1  2 
kernel/module.c
lib/Kconfig.debug
mm/kmemleak.c
mm/slab.c

diff --cc kernel/module.c
Simple merge
Simple merge
diff --cc mm/kmemleak.c
Simple merge
diff --cc mm/slab.c
Simple merge