summaryrefslogtreecommitdiffstats
path: root/include/linux/atmsap.h
diff options
context:
space:
mode:
authorLinus Torvalds2009-06-17 18:41:25 +0200
committerLinus Torvalds2009-06-17 18:41:25 +0200
commit4ce4b1b73b4dd37e4a70390976ac0bcf7038d6f9 (patch)
tree2e8de1e183eb5f8c7b55b22d65bc698367e7f8a8 /include/linux/atmsap.h
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentMerge branch 'slub/earlyboot' into for-linus (diff)
downloadkernel-qcow2-linux-4ce4b1b73b4dd37e4a70390976ac0bcf7038d6f9.tar.gz
kernel-qcow2-linux-4ce4b1b73b4dd37e4a70390976ac0bcf7038d6f9.tar.xz
kernel-qcow2-linux-4ce4b1b73b4dd37e4a70390976ac0bcf7038d6f9.zip
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: Fix early boot GFP_DMA allocations SLUB: Don't print out OOM warning for __GFP_NOFAIL SLUB: fix build when !SLUB_DEBUG SLUB: Out-of-memory diagnostics slab: document kzfree() zeroing behavior slab: fix generic PAGE_POISONING conflict with SLAB_RED_ZONE slob: use PG_slab for identifying SLOB pages
Diffstat (limited to 'include/linux/atmsap.h')
0 files changed, 0 insertions, 0 deletions