Merge remote-tracking branch 'remotes/origin/tomato-ND-USBmod' into Teaman-ND
commit1fad4c9cb38997e0469438cf34dcdb90ed6f80f8
authorAugusto Bott <augusto@bott.com.br>
Tue, 8 Nov 2011 05:21:39 +0000 (8 03:21 -0200)
committerAugusto Bott <augusto@bott.com.br>
Tue, 8 Nov 2011 05:21:39 +0000 (8 03:21 -0200)
tree6640794cf5bd95c34b1fdd28a2cef1c4fd118fa0
parentb8ab745f7be73ce41fa5b5dd7c14537e07a73304
parentb1da775b172e2fe1b88b0de95a3042379df3de7b
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:
release/src/Makefile
release/src/linux/linux/config_base
release/src/router/Makefile
release/src/router/httpd/bwm.c
release/src/router/httpd/ctnf.c
release/src/router/httpd/httpd.c
release/src/router/httpd/nvram.c
release/src/router/httpd/tomato.c
release/src/router/httpd/wl.c
release/src/router/nvram/defaults.c
release/src/router/rc/firewall.c
release/src/router/rc/init.c
release/src/router/rc/network.c
release/src/router/rc/rc.h
release/src/router/rc/services.c
release/src/router/rc/wan.c
release/src/router/rc/wnas.c
release/src/router/shared/misc.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
release/src/router/www/bwm-common.js
release/src/router/www/forward-upnp.asp
release/src/router/www/qos-graphs.asp
release/src/router/www/status-data.jsx
release/src/router/www/status-overview.asp
release/src/router/www/status-webmon.asp
release/src/router/www/tomato.js