Merge remote-tracking branch 'remotes/origin/tomato-ND-USBmod' into Teaman-ND
* remotes/origin/tomato-ND-USBmod: (224 commits)
rc, web ui: allow to specify root directory for each FTP user
PPP: single line MLPPP support
Dnsmasq: 2.58 update
MiniDLNA 1.0.22: cvs 2011-08-25
usb_modeswitch: ver. 1.1.9 with data package 2011-08-05
radvd: 1.8.1 update
ebtables: update to 2.0.10-2 (August 11th, 2011)
Web GUI: relax WAN domain validation
Build: K26 kernel config
Samba 3: security updates CVE-2011-2522 and CVE-2011-2694 (unused in Tomato)
rc/httpd: mmc/sd support in K26 USB Ext builds
Build: include mmc/sd modules into K26 USB w/Extras builds
rc/shared: ASUS RT-N66U ID
rc: changes for updated USB LED driver
accel-pptp: various fixes and updates
fpkg: add support for Asus firmware images
Build: prebuilt Makefile, added a few header files, cosmetics
rc: allow custom xl2tpd config options
usb_modeswitch: data package 2011-07-14
Build: ebtables: lock file name
...
Conflicts:
release/src/Makefile
release/src/router/httpd/httpd.c
release/src/router/rc/firewall.c
release/src/router/rc/services.c
release/src/router/www/Makefile
release/src/router/www/about.asp
release/src/router/www/advanced-wireless.asp
release/src/router/www/basic-network.asp
29 files changed: