Skip to content
Commit 8c1c6c75 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into dma-mapping-for-next

Pull in the latest 5.9 tree for the commit to revert the
V4L2_FLAG_MEMORY_NON_CONSISTENT uapi addition.
parents 38225f2e 171d4ff7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment