Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2011 23:44:13 +0000 (16:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2011 23:44:13 +0000 (16:44 -0700)
commit83d7e948754cf021ed7343b122940fcc27c1bd88
treef04ba1ecb4fa337fc2bbd49b44df07775e4636ff
parentfce4a1dda2f1a9a25b3e5b7cd951070e0b42a818
parent9b090f2da85bd0df5e1a1ecfe4120b7b50358f48
Merge branch 'for-linus' of git://git./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
lib/Kconfig.debug