Merge branch 'master' into ozonet

diff --combined target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 282210ce4f0958646c3f5b500492e945a98dd773,ba65a790060c5d0db40860befce74ae4b05432e0..98eb8ec523c0dcdc953714ca91e9ebf90e1e55ca
--- 1/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
--- 2/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@@ -7,7 -7,7 +7,7 @@@
  
  PART_NAME=firmware
  RAMFS_COPY_DATA=/lib/ar71xx.sh
- [ -x /usr/sbin/nandwrite ] && RAMFS_COPY_BIN=/usr/sbin/nandwrite
+ RAMFS_COPY_BIN='nandwrite'
  
  CI_BLKSZ=65536
  CI_LDADR=0x80060000
@@@ -287,6 -287,7 +287,7 @@@ platform_check_image() 
        wpj342|\
        wpj344|\
        wpj531|\
+       wpj558|\
        wpj563|\
        wrt400n|\
        wrtnode2q|\
@@@ -323,7 -324,6 +324,6 @@@
        hornet-ub|\
        mr12|\
        mr16|\
-       wpj558|\
        zbt-we1526|\
        zcn-1523h-2|\
        zcn-1523h-5)
@@@ -447,6 -447,7 +447,7 @@@
        tl-wr841n-v9|\
        tl-wr842n-v2|\
        tl-wr842n-v3|\
+       tl-wr902ac-v1|\
        tl-wr941nd-v5|\
        tl-wr941nd-v6|\
        tl-wr940n-v4|\
@@@ -503,7 -504,6 +504,7 @@@
        rb-450g|\
        rb-493|\
        rb-493g|\
 +      rb-711|\
        rb-750|\
        rb-750gl|\
        rb-751|\
@@@ -658,8 -658,7 +659,7 @@@
        rb-952ui-5ac2nd|\
        rb-962uigs-5hact2hnt|\
        rb-lhg-5nd|\
-       rb-mapl-2nd|\
-       tl-wr902ac-v1)
+       rb-mapl-2nd)
                return 0
                ;;
        esac
@@@ -686,7 -685,6 +686,7 @@@ platform_pre_upgrade() 
        rb-450g|\
        rb-493|\
        rb-493g|\
 +      rb-711|\
        rb-750|\
        rb-750gl|\
        rb-751|\