diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 16:26:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 16:26:57 -0700 |
commit | 01ba82514603593bb11589e2ea2afdeba1921636 (patch) | |
tree | c66c762ac6bb98c450e6852aee914e883449c488 /include/asm-generic | |
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
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions