summaryrefslogtreecommitdiff
path: root/arch/nds32
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-11-21 18:13:03 +0100
committerChristoph Hellwig <hch@lst.de>2019-11-21 18:13:03 +0100
commitd7293f79caea45c50c0ab4294847e7af96501ced (patch)
tree04d55fbe33562f4d242e0445baae55690ebb6682 /arch/nds32
parent68a33b1794665ba8a1d1ef1d3bfcc7c587d380a6 (diff)
parentbff3b04460a80f425442fe8e5c6ee8c3ebef611f (diff)
downloadlinux-sh-d7293f79caea45c50c0ab4294847e7af96501ced.tar.gz
Merge branch 'for-next/zone-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into dma-mapping-for-next
Pull in a stable branch from the arm64 tree that adds the zone_dma_bits variable to avoid creating hard to resolve conflicts with that addition.
Diffstat (limited to 'arch/nds32')
0 files changed, 0 insertions, 0 deletions