Skip to content
GitLab
Commit 5ffa70b2 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

Merge tag 'v4.13-rc7' into mtd/next 

Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.
parents 75864b30 cc4a41fe
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment