Dev merge into trunk

diff --cc trunk/target/linux/ar71xx/base-files/etc/diag.sh
index c022013f8f38a7cc2074e85dfc0e102d48716f6a,561c5da585c459f225901fd8ebc5135ce2f063ad..561c5da585c459f225901fd8ebc5135ce2f063ad
mode 100755,100644..100755
--- 1/trunk/target/linux/ar71xx/base-files/etc/diag.sh
--- 2/trunk/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/trunk/target/linux/ar71xx/base-files/etc/diag.sh

diff --cc trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 9517b97ed1f93e2ff1cdd75debef12aa2c6633d7,2aced37f8d480458705f240341c3c6ab7bc155ce..2aced37f8d480458705f240341c3c6ab7bc155ce
mode 100755,100644..100755
--- 1/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
--- 2/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds

diff --cc trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
index d9aa51989a7af4d41dcb32fcec3a635146d89836,aa0e1b4e2f2eab85adcdebcd3daf2fac6c781693..aa0e1b4e2f2eab85adcdebcd3daf2fac6c781693
mode 100755,100644..100755
--- 1/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
--- 2/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration

diff --cc trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
index 1cef8b993772a36d2df7dd4d69a6c94a7f82c8ca,d578f59f7c13c75396eed151a274752214992a98..d578f59f7c13c75396eed151a274752214992a98
mode 100755,100644..100755
--- 1/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
--- 2/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration