diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 23:35:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 23:35:40 +0100 |
| commit | 64096c17417380d8a472d096645f4cbc9406c987 (patch) | |
| tree | e01d22012de7694206143b5606f7d51f225eb249 /drivers/watchdog/Makefile | |
| parent | Merge branch 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs... (diff) | |
| parent | SLUB: Fix per-cpu merge conflict (diff) | |
| download | linux-64096c17417380d8a472d096645f4cbc9406c987.tar.xz linux-64096c17417380d8a472d096645f4cbc9406c987.zip | |
Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
SLUB: Fix per-cpu merge conflict
failslab: add ability to filter slab caches
slab: fix regression in touched logic
dma kmalloc handling fixes
slub: remove impossible condition
slab: initialize unused alien cache entry as NULL at alloc_alien_cache().
SLUB: Make slub statistics use this_cpu_inc
SLUB: this_cpu: Remove slub kmem_cache fields
SLUB: Get rid of dynamic DMA kmalloc cache allocation
SLUB: Use this_cpu operations in slub
Diffstat (limited to 'drivers/watchdog/Makefile')
0 files changed, 0 insertions, 0 deletions