tree 17d5401aebd5fe00a4878353353e29fc8c569b89
parent 26b55633a891a28bf04f42882de145eb8e9cb9ad
parent 145b64b9588c123d2bd00981c5ce8e03215ed2ee
author Linus Torvalds <torvalds@linux-foundation.org> 1281473891 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281473891 -0700

Merge branch 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm

* 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm:
  kmemleak: Fix typo in the comment
  lib/scatterlist: Hook sg_kmalloc into kmemleak (v2)
  kmemleak: Add DocBook style comments to kmemleak.c
  kmemleak: Introduce a default off mode for kmemleak
  kmemleak: Show more information for objects found by alias