Public Git Hosting - tomato.git/commit

Merge branch 'tomato-ND-kernel-update' into tomato-ND-USBmod

Conflicts:

release/src/router/www/advanced-ctnf.asp

Tomato firmware and modifications.

release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
release/src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c	diff1 \|	diff2 \|	blob \| history
release/src/router/httpd/tomato.c	diff1 \|	diff2 \|	blob \| history
release/src/router/rc/misc.c	diff1 \|	diff2 \|	blob \| history
release/src/router/www/advanced-ctnf.asp	diff1 \|	diff2 \|	blob \| history