summaryrefslogtreecommitdiffstats
path: root/include/linux/atmsap.h
diff options
context:
space:
mode:
authorPekka Enberg2009-06-17 07:30:54 +0200
committerPekka Enberg2009-06-17 07:30:54 +0200
commit5caf5c7dc2d303b770e426f7e2238df882f1773b (patch)
tree1dddb1941da34326e8e8becef10761d2d5d7fcc9 /include/linux/atmsap.h
parentMerge branches 'slab/documentation', 'slab/fixes', 'slob/cleanups' and 'slub/... (diff)
parentSLUB: Fix early boot GFP_DMA allocations (diff)
downloadkernel-qcow2-linux-5caf5c7dc2d303b770e426f7e2238df882f1773b.tar.gz
kernel-qcow2-linux-5caf5c7dc2d303b770e426f7e2238df882f1773b.tar.xz
kernel-qcow2-linux-5caf5c7dc2d303b770e426f7e2238df882f1773b.zip
Merge branch 'slub/earlyboot' into for-linus
Conflicts: mm/slub.c
Diffstat (limited to 'include/linux/atmsap.h')
0 files changed, 0 insertions, 0 deletions