Merge branch 'Teaman-ND' into Teaman-ND-SDHCTeaman-ND-1.28.0010-SDHC
commitea8a970a3ddc964d818ed448751f84fa5d1f5972
authorAugusto Bott <augusto@bott.com.br>
Fri, 11 Nov 2011 02:39:27 +0000 (11 00:39 -0200)
committerAugusto Bott <augusto@bott.com.br>
Fri, 11 Nov 2011 02:39:27 +0000 (11 00:39 -0200)
tree7343d095ba99203f2876ba0de65bebd24120afcb
parent7fe19cfe85a55593a24abaf9b24ec45897a1b595
parent0a7fcd2320a487b2bee0ee924da7ffb7df6c75a6
Merge branch 'Teaman-ND' into Teaman-ND-SDHC

* Teaman-ND: (228 commits)
  IPTraffic: bugfix on populateCache()
  Lan Access: revised filter_forward iptables rules creation order
  Makefile: fix building WRT54x firmware images
  K24: fix kernel compilation error
  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
  ...

Conflicts:
release/src/Makefile
release/src/Makefile
release/src/router/Makefile
release/src/router/httpd/misc.c
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c
release/src/router/rc/rc.h
release/src/router/rc/services.c
release/src/router/www/Makefile
release/src/router/www/about.asp
release/src/router/www/tomato.js