Public Git Hosting - tomato.git/commit

commit	106cad56771c25e59ede44a449e56f5febacff6d
author	Shibby <shibby@openlinksys.info>
	Wed, 8 Apr 2015 13:21:52 +0000 (8 15:21 +0200)
committer	Shibby <shibby@openlinksys.info>
	Wed, 8 Apr 2015 13:21:52 +0000 (8 15:21 +0200)
tree	b0279c800ebd6bad9a5c546cdd9dfbb253391cf8	tree
parent	37a8603b5201d02047b2593fb10d1ed40b564bff	commit \| diff
parent	032a709980973e656618fe4ed7695c91f4a8f514	commit \| diff

Merged in qinyq/tomato-arm-qin/shibby-arm-qin-ea6700 (pull request #12)

Conflicts:
release/src-rt-6.x.4708/router/www/advanced-vlan.asp

Tomato firmware and modifications.

release/src-rt-6.x.4708/Makefile	diff1 \|	diff2 \|	blob \| history
release/src-rt-6.x.4708/router/rc/init.c	diff1 \|	diff2 \|	blob \| history
release/src-rt-6.x.4708/router/shared/id.c	diff1 \|	diff2 \|	blob \| history
release/src-rt-6.x.4708/router/www/advanced-vlan.asp	diff1 \|	diff2 \|	blob \| history