Public Git Hosting - tomato.git/commit

Merge branch 'tomato-K26-usbmod-base' into tomato-ND-USBmod

Conflicts:

release/src/router/rc/services.c
release/src/router/rc/wnas.c

22 files changed:

release/src/router/Makefile	diff1 \|	diff2 \|	blob \| history
release/src/router/common.mak	diff1 \|	diff2 \|	blob \| history
release/src/router/httpd/misc.c	diff1 \|	diff2 \|	blob \| history
release/src/router/httpd/tomato.c	diff1 \|	diff2 \|	blob \| history
release/src/router/nvram/defaults.c	diff1 \|	diff2 \|	blob \| history
release/src/router/others/rootprep.sh	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/Makefile	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/buttons.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/firewall.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/init.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/misc.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/mtd.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/network.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/rc.h	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/services.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/wnas.c	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/Makefile	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/led.c	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/shared.h	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/shutils.c	diff1 \|	diff2 \|	blob \| history
release/src/router/www/Makefile	diff1 \|	diff2 \|	blob \| history
release/src/router/www/advanced-ctnf.asp	diff1 \|	diff2 \|	blob \| history

Tomato firmware and modifications.

release/src/router/Makefile	diff1 \|	diff2 \|	blob \| history
release/src/router/common.mak	diff1 \|	diff2 \|	blob \| history
release/src/router/httpd/misc.c	diff1 \|	diff2 \|	blob \| history
release/src/router/httpd/tomato.c	diff1 \|	diff2 \|	blob \| history
release/src/router/nvram/defaults.c	diff1 \|	diff2 \|	blob \| history
release/src/router/others/rootprep.sh	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/Makefile	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/buttons.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/firewall.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/init.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/misc.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/mtd.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/network.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/rc.h	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/services.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/wnas.c	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/Makefile	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/led.c	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/shared.h	diff1 \|	diff2 \|	blob \| history
release/src/router/shared/shutils.c	diff1 \|	diff2 \|	blob \| history
release/src/router/www/Makefile	diff1 \|	diff2 \|	blob \| history
release/src/router/www/advanced-ctnf.asp	diff1 \|	diff2 \|	blob \| history