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.
This commit is contained in:
Boris Brezillon
2017-08-28 18:04:15 +02:00
1585 changed files with 29009 additions and 24161 deletions

View File

@@ -681,10 +681,10 @@ struct nand_buffers {
* @tWW_min: WP# transition to WE# low
*/
struct nand_sdr_timings {
u32 tBERS_max;
u64 tBERS_max;
u32 tCCS_min;
u32 tPROG_max;
u32 tR_max;
u64 tPROG_max;
u64 tR_max;
u32 tALH_min;
u32 tADL_min;
u32 tALS_min;