Merge commit '333c0dbfcd7847d02d75a2d2a80d2f5e1cdc51dc' into m0-up

Conflicts:
	drivers/Kconfig
	drivers/Makefile
	drivers/nfc/Kconfig
	drivers/nfc/Makefile
	net/Makefile
misc