| commit | 1b59be2a6cdcb5a12e18d8315c07c94a624de48f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jan 15 13:01:14 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jan 15 13:01:14 2011 -0800 |
| tree | 5cf48d9f94d85e9b1f984610b6868ad100ca1916 | |
| parent | f9ee7f60d6f37ae0184812b4c59b3869f875768b [diff] | |
| parent | 2ed1c5257b5d669df2a64bd53e61dc19c7d936cd [diff] |
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