diff options
author | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-06-30 13:52:24 +0300 |
---|---|---|
committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-06-30 13:52:24 +0300 |
commit | 0bcc3939c98d83955397eac1584d5f791fdc88d0 (patch) | |
tree | 21e6be9c578916ca86ffe0f88a9d807435318964 /Makefile | |
parent | 600d050944e133fde1f54b9113b01ccefbd82820 (diff) | |
parent | c17e5c85b32f8809135f3211ba2525fb98b5c09f (diff) | |
download | linux-0bcc3939c98d83955397eac1584d5f791fdc88d0.tar.xz |
Merge tag 'spi-nor/for-5.14' into mtd/next
SPI NOR core changes:
- Ability to dump SFDP tables via sysfs
- Support for erasing OTP regions on Winbond and similar flashes
- Few API doc updates and fixes
- Locking support for MX25L12805D
SPI NOR controller drivers changes:
- Use SPI_MODE_X_MASK in nxp-spifi
- Intel Alder Lake-M SPI serial flash support
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ VERSION = 5 PATCHLEVEL = 13 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc3 NAME = Frozen Wasteland # *DOCUMENTATION* |