From: Linus Torvalds Date: Mon, 26 May 2008 17:21:26 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... X-Git-Tag: v2.6.26-rc4~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1434b65731963207a4cc84bd87e6191e34321986;p=~shefty%2Frdma-dev.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: ksize() abuse checks slob: Fix to return wrong pointer --- 1434b65731963207a4cc84bd87e6191e34321986