| commit | 8d0e7fb9d1581c4543ea917c2ea1a50db607a344 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Dec 12 11:37:39 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Dec 12 11:37:39 2009 -0800 |
| tree | 8b407cdfb6e354971d7406edd99545de66252dab | |
| parent | 702a7c7609bec3a940b6a46b0d6ab9ce45274580 [diff] | |
| parent | 355d79c87a53aa08c33deba184b8c87763a08270 [diff] |
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