From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Jan 2011 21:01:14 +0000 (-0800)
Subject: Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Tag: v2.6.38-rc1~36
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1b59be2a6cdcb5a12e18d8315c07c94a624de48f;p=~shefty%2Frdma-dev.git

Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  Update Pekka's email address in MAINTAINERS
  mm/slab.c: make local symbols static
  slub: Avoid use of slub_lock in show_slab_objects()
  memory hotplug: one more lock on memory hotplug
---

1b59be2a6cdcb5a12e18d8315c07c94a624de48f