summaryrefslogtreecommitdiffstats
path: root/drivers/ps3
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 11:44:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 11:44:08 -0700
commitb57bdda58cda0aaf6def042d101dd85977a286ed (patch)
tree7f63afddb8275d67214d7a89cfc8a65815e79d42 /drivers/ps3
parentcc41f5cede3c63836d1c0958204630b07f5b5ee7 (diff)
parent415cb47998c54195710d413c3d95e37a9339c1e8 (diff)
downloadlinux-b57bdda58cda0aaf6def042d101dd85977a286ed.tar.bz2
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: slub: Allow removal of slab caches during boot Revert "slub: Allow removal of slab caches during boot" slub numa: Fix rare allocation from unexpected node slab: use deferable timers for its periodic housekeeping slub: Use kmem_cache flags to detect if slab is in debugging mode. slub: Allow removal of slab caches during boot slub: Check kasprintf results in kmem_cache_init() SLUB: Constants need UL slub: Use a constant for a unspecified node. SLOB: Free objects to their own list slab: fix caller tracking on !CONFIG_DEBUG_SLAB && CONFIG_TRACING
Diffstat (limited to 'drivers/ps3')
0 files changed, 0 insertions, 0 deletions