aboutsummaryrefslogtreecommitdiffstats
path: root/include/video/uvesafb.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-05 17:35:40 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-05 17:35:40 -0500
commit64096c17417380d8a472d096645f4cbc9406c987 (patch)
treee01d22012de7694206143b5606f7d51f225eb249 /include/video/uvesafb.h
parentcc7889ff5ee7a1c1a2b5073c53db5ad9b76f14e2 (diff)
parent1154fab73ccbab010cfaa272b6987c624cfd63c6 (diff)
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 'include/video/uvesafb.h')
0 files changed, 0 insertions, 0 deletions