Fixed version string
Merge branch 'master' of github.com:RMerl/asuswrt-merlin
Merge branch 'master' into sdk5100

Conflicts:
	release/src-rt/version.conf
rc: Fix building for RT-N16
aicloud: Updated MIPS binaries (from 374.1631)
Updated documentation
Merge branch 'master' into sdk5100
Merge with 374_2078
Manually copy prebuilt emf/igs kernel modules for MIPS, since we don't have up-to-date linkable objects for the new SDK (yet)
build: emf and igs userspace tools were missing from ARM builds
build: renamed prebuilt directory to fix missing igs userspace tool (ARM)
wl: Updated drivers for AC56 and AC68 (they are now different) with Jan 3rd build from Asus
Merge branch '374-2078'
Bumped revision to 374.38 alpha 1
Updated documentation
Merge branch 'master' into sdk5100

Conflicts:
	release/src-rt/linux/linux-2.6/drivers/net/ppp_generic.c
	release/src-rt/linux/linux-2.6/drivers/net/wl/wl_generic.mk
	release/src-rt/linux/linux-2.6/include/linux/skbuff.h
	release/src-rt/linux/linux-2.6/net/netfilter/nf_conntrack_core.c
	release/src-rt/version.conf
	release/src/router/ctf/linux/ctf.o