tree f04ba1ecb4fa337fc2bbd49b44df07775e4636ff
parent fce4a1dda2f1a9a25b3e5b7cd951070e0b42a818
parent 9b090f2da85bd0df5e1a1ecfe4120b7b50358f48
author Linus Torvalds <torvalds@linux-foundation.org> 1305848653 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305848653 -0700

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm:
  kmemleak: Initialise kmemleak after debug_objects_mem_init()
  kmemleak: Select DEBUG_FS unconditionally in DEBUG_KMEMLEAK
  kmemleak: Do not return a pointer to an object that kmemleak did not get