]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorIngo Molnar <mingo@elte.hu>
Fri, 20 Feb 2009 11:15:30 +0000 (12:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 20 Feb 2009 11:15:30 +0000 (12:15 +0100)
commit057685cf57066bc8aaed68de1b1970e12f0075d2
treee7fea68e7080d6366b45775028bfbdf6237ecda5
parent64b36ca7f408e0bd45487c8c28f168f11f3b6dcd
parentfe1200b63d158b28eef6d4de1e5b5f99c681ba2f
Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 into tracing/kmemtrace

Conflicts:
mm/slub.c
include/linux/slub_def.h
mm/slub.c