git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 893fd95 c0f7ae2)
Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next
authorTudor Ambarus <tudor.ambarus@linaro.org>
Mon, 6 Feb 2023 09:23:34 +0000 (11:23 +0200)
committerTudor Ambarus <tudor.ambarus@linaro.org>
Mon, 6 Feb 2023 09:23:34 +0000 (11:23 +0200)
Merge 'mtd/fixes-for-6.2-rc4' into spi-nor/next to fix conflict on
include headers in drivers/mtd/spi-nor/core.c.

Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.