diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 15:14:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 15:14:55 -0500 |
commit | 2c8296f8cf0ec40867965dddef3dfe92f73b38f4 (patch) | |
tree | 9d50fb09cd08a2677b3590668cbd49a7aa7f7a63 /include/asm-arm/arch-ixp4xx/ixp4xx-regs.h | |
parent | d2fc0bacd5c438cb459fdf531eff00ab18422a00 (diff) | |
parent | da89b79ed06bac8e9b5b6874d4efc5382e1091de (diff) |
Merge branch 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
* 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
Explain kmem_cache_cpu fields
SLUB: Do not upset lockdep
SLUB: Fix coding style violations
Add parameter to add_partial to avoid having two functions
SLUB: rename defrag to remote_node_defrag_ratio
Move count_partial before kmem_cache_shrink
SLUB: Fix sysfs refcounting
slub: fix shadowed variable sparse warnings
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/ixp4xx-regs.h')
0 files changed, 0 insertions, 0 deletions