aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel/nmi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 19:44:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 19:44:13 -0400
commit83d7e948754cf021ed7343b122940fcc27c1bd88 (patch)
treef04ba1ecb4fa337fc2bbd49b44df07775e4636ff /arch/blackfin/kernel/nmi.c
parentfce4a1dda2f1a9a25b3e5b7cd951070e0b42a818 (diff)
parent9b090f2da85bd0df5e1a1ecfe4120b7b50358f48 (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
Diffstat (limited to 'arch/blackfin/kernel/nmi.c')
0 files changed, 0 insertions, 0 deletions