Merge remote-tracking branch 'l2-mtd/master'

diff --cc drivers/mtd/maps/physmap_of.c
Simple merge

diff --cc drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
index 595de4012e71971c6453a5499334c28e6185390b,37d5b895669442afdfb6b536968aaffd31d0e8c7..b2ab373c9eefd37c3ab970d078501a9ad423d698
--- 1/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
--- 2/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+++ b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
@@@ -14,11 -16,9 +16,9 @@@
  #include <linux/slab.h>
  #include <linux/bcma/bcma.h>
  
- #include "bcm47xxnflash.h"
- 
  /* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has
 - * shown 164 retries as maxiumum. */
 -#define NFLASH_READY_RETRIES          1000
 + * shown ~1000 retries as maxiumum. */
 +#define NFLASH_READY_RETRIES          10000
  
  #define NFLASH_SECTOR_SIZE            512
  

diff --cc drivers/mtd/nand/nand_base.c
Simple merge

diff --cc include/linux/bcma/bcma_driver_chipcommon.h
Simple merge