modified:   mc-icsp/Makefile
	modified:   mc-icsp-custom/Makefile
	modified:   mc-icsp-custom/src/Kconfig
	modified:   mc-icsp-custom/src/Makefile
	modified:   mc-icsp/Makefile
Merge branch 'master' of https://github.com/GBert/openwrt-files

Conflicts:
	mc-icsp-custom/src/Makefile

	modified:   mc-icsp-custom/src/Makefile