]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 May 2021 00:42:21 +0000 (10:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 May 2021 00:42:21 +0000 (10:42 +1000)
1  2 
drivers/media/common/videobuf2/frame_vector.c
include/linux/mm.h
mm/memory.c
security/Kconfig

Simple merge
diff --cc mm/memory.c
Simple merge
Simple merge