From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Dec 2009 19:37:39 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Tag: v2.6.33-rc1~297
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8d0e7fb9d1581c4543ea917c2ea1a50db607a344;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:
  slab, kmemleak: pass the correct pointer to kmemleak_erase()
  slab, kmemleak: stop calling kmemleak_erase() unconditionally
  SLAB: Fix unlikely() annotation in __cache_alloc_node()
  SLAB: Fix lockdep annotations for CPU hotplug
  SLUB: Fix __GFP_ZERO unlikely() annotation
  slub: allow stats to be cleared
---

8d0e7fb9d1581c4543ea917c2ea1a50db607a344