| commit | 01ba82514603593bb11589e2ea2afdeba1921636 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 22 Mar 2011 23:26:57 +0000 (22 16:26 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 22 Mar 2011 23:26:57 +0000 (22 16:26 -0700) | ||
| tree | c66c762ac6bb98c450e6852aee914e883449c488 | treesnapshot (tar.gz zip) |
| parent | ab70a1d7c7fc6665d83f41b5ce790ff8376e0b81 | commitdiff |
| parent | 4fdccdfbb4652a7bbac8adbce7449eb093775118 | commitdiff |
Merge branch 'slab/urgent' of git://git./linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Add statistics for this_cmpxchg_double failures
slub: Add missing irq restore for the OOM path
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Add statistics for this_cmpxchg_double failures
slub: Add missing irq restore for the OOM path