Merge branch 'tomato-shibby-RT-N' into tomato-shibby-RT-AC
commitdf35c1edd4307410f361e99cbbe35236dd6f14ae
authorShibby <shibby@openlinksys.info>
Sat, 8 Jun 2013 15:16:52 +0000 (8 17:16 +0200)
committerShibby <shibby@openlinksys.info>
Sat, 8 Jun 2013 15:16:52 +0000 (8 17:16 +0200)
treeeec145cec367923f97cad99b2ee6b04631ff3fbb
parent1ca4d6555ec057ed09f9e6f15ca522f685666ae7
parentf89cbb35b812b0ae6e10b3030d6079090da52679
Merge branch 'tomato-shibby-RT-N' into tomato-shibby-RT-AC
release/src-rt/et/sys/et_linux.c
release/src-rt/linux/linux-2.6/config_base
release/src/router/rc/init.c