]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jan 2011 21:01:14 +0000 (13:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jan 2011 21:01:14 +0000 (13:01 -0800)
commit1b59be2a6cdcb5a12e18d8315c07c94a624de48f
tree5cf48d9f94d85e9b1f984610b6868ad100ca1916
parentf9ee7f60d6f37ae0184812b4c59b3869f875768b
parent2ed1c5257b5d669df2a64bd53e61dc19c7d936cd
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