| commit | 83d7e948754cf021ed7343b122940fcc27c1bd88 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 19 16:44:13 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 19 16:44:13 2011 -0700 |
| tree | f04ba1ecb4fa337fc2bbd49b44df07775e4636ff | |
| parent | fce4a1dda2f1a9a25b3e5b7cd951070e0b42a818 [diff] | |
| parent | 9b090f2da85bd0df5e1a1ecfe4120b7b50358f48 [diff] |
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