From: Linus Torvalds Date: Mon, 10 Jan 2011 16:38:01 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... X-Git-Tag: v2.6.38-rc1~436 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9;p=pandora-kernel.git Merge branch 'for-linus' of git://git./linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Fix a crash during slabinfo -v tracing/slab: Move kmalloc tracepoint out of inline code slub: Fix slub_lock down/up imbalance slub: Fix build breakage in Documentation/vm slub tracing: move trace calls out of always inlined functions to reduce kernel code size slub: move slabinfo.c to tools/slub/slabinfo.c --- a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 Reading git-diff-tree failed