summaryrefslogtreecommitdiff
path: root/proto_ipv6.c
diff options
context:
space:
mode:
Diffstat (limited to 'proto_ipv6.c')
0 files changed, 0 insertions, 0 deletions
mmitc45564e91604ca4d03505ba4d567541c7e4f86fe (patch) treef686dce956b8ceef91215aff55009555875b394c /drivers/clk/clk-wm831x.c parent93874681aa3f538a2b9d59a6c5b7c0e882a36978 (diff)parent4009793e15d44469da1547a46ab129cc08ffa503 (diff)
Merge branch 'for-v3.8' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull CMA and DMA-mapping update from Marek Szyprowski: "Another set of Contiguous Memory Allocator and DMA-mapping framework updates for v3.8. This pull request consists only of two patches. The first fixes a long standing issue with dmapools (the code predates current GIT history), which forced all allocations to use GFP_ATOMIC flag, ignoring the flags passed by the caller. The second patch changes CMA code to correctly use phys_addr_t type what enables support for LPAE systems." * 'for-v3.8' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: drivers: cma: represent physical addresses as phys_addr_t mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls
Diffstat (limited to 'drivers/clk/clk-wm831x.c')