Merge branch 'master' into ozonet

author Alexandros Couloumbis <alex@ozo.com>

Thu, 20 Aug 2020 06:59:05 +0000 (09:59 +0300)

committer Alexandros Couloumbis <alex@ozo.com>

Thu, 20 Aug 2020 06:59:05 +0000 (09:59 +0300)
author Alexandros Couloumbis <alex@ozo.com>
Thu, 20 Aug 2020 06:59:05 +0000 (09:59 +0300)
committer Alexandros Couloumbis <alex@ozo.com>
Thu, 20 Aug 2020 06:59:05 +0000 (09:59 +0300)
diff --cc package/devel/perf/Makefile
Simple merge
diff --cc package/kernel/mac80211/ath.mk
Simple merge
diff --cc target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c
Simple merge
diff --cc target/linux/generic/pending-4.4/834-ledtrig-libata.patch
Simple merge
diff --cc target/linux/generic/pending-4.9/834-ledtrig-libata.patch
Simple merge
author	Alexandros Couloumbis <alex@ozo.com>
	Thu, 20 Aug 2020 06:59:05 +0000 (09:59 +0300)
committer	Alexandros Couloumbis <alex@ozo.com>
	Thu, 20 Aug 2020 06:59:05 +0000 (09:59 +0300)
		1	2
package/devel/perf/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
package/kernel/mac80211/ath.mk	patch \|	diff1 \|	diff2 \|	blob \| history
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c	patch \|	diff1 \|	diff2 \|	blob \| history
target/linux/generic/pending-4.4/834-ledtrig-libata.patch	patch \|	diff1 \|	diff2 \|	blob \| history
target/linux/generic/pending-4.9/834-ledtrig-libata.patch	patch \|	diff1 \|	diff2 \|	blob \| history