diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-02-09 02:00:24 +0300 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-02-09 02:00:24 +0300 |
| commit | 9c8d7ff32a0aa001ac8506180e1662ecdf927f32 (patch) | |
| tree | 65f44bde4c200c7485479d59df550815371c0ab0 /Makefile | |
| parent | 5d708ecc6c7718c22bcacabff0fbb32ecd19ad6b (diff) | |
| parent | a4077ce5871304f8a78f80b74b18b6052a410f1a (diff) | |
| download | linux-9c8d7ff32a0aa001ac8506180e1662ecdf927f32.tar.xz | |
Merge tag 'nand/for-4.11' of github.com:linux-nand/linux
From Boris:
"""
This pull request contains minor fixes/improvements on existing drivers:
- sunxi: avoid busy-waiting for NAND events
- ifc: fix ECC handling on IFC v1.0
- OX820: add explicit dependency on ARCH_OXNAS in Kconfig
- core: add a new manufacture ID and fix a kernel-doc warning
- fsmc: kill pdata support
- lpc32xx_slc: remove unneeded NULL check
"""
Conflicts:
include/linux/mtd/nand.h
[Brian: trivial conflict in the comment section]
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,8 +1,8 @@ VERSION = 4 PATCHLEVEL = 10 SUBLEVEL = 0 -EXTRAVERSION = -rc5 -NAME = Anniversary Edition +EXTRAVERSION = -rc6 +NAME = Fearless Coyote # *DOCUMENTATION* # To see a list of typical targets execute "make help" |