Merge branch 'master' into ozonet
authorAlexandros Couloumbis <alex@ozo.com>
Sun, 9 Jul 2017 05:44:37 +0000 (08:44 +0300)
committerAlexandros Couloumbis <alex@ozo.com>
Sun, 9 Jul 2017 05:44:37 +0000 (08:44 +0300)
1  2 
package/kernel/mac80211/Makefile
target/linux/ar71xx/base-files/etc/diag.sh
target/linux/ar71xx/base-files/lib/ar71xx.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/generic/config-4.4

Simple merge
Simple merge