| commit | 01ba82514603593bb11589e2ea2afdeba1921636 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 22 16:26:57 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 22 16:26:57 2011 -0700 |
| tree | c66c762ac6bb98c450e6852aee914e883449c488 | |
| parent | ab70a1d7c7fc6665d83f41b5ce790ff8376e0b81 [diff] | |
| parent | 4fdccdfbb4652a7bbac8adbce7449eb093775118 [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: slub: Add statistics for this_cmpxchg_double failures slub: Add missing irq restore for the OOM path