diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-11-21 18:13:03 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-11-21 18:13:03 +0100 |
| commit | d7293f79caea45c50c0ab4294847e7af96501ced (patch) | |
| tree | 04d55fbe33562f4d242e0445baae55690ebb6682 /kernel/trace/trace_event_perf.c | |
| parent | 68a33b1794665ba8a1d1ef1d3bfcc7c587d380a6 (diff) | |
| parent | bff3b04460a80f425442fe8e5c6ee8c3ebef611f (diff) | |
| download | linux-d7293f79caea45c50c0ab4294847e7af96501ced.tar.gz linux-d7293f79caea45c50c0ab4294847e7af96501ced.tar.bz2 linux-d7293f79caea45c50c0ab4294847e7af96501ced.zip | |
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 'kernel/trace/trace_event_perf.c')
0 files changed, 0 insertions, 0 deletions