| commit | 4c40c7ec862793b96cdc81e396903fe49a5a6fa3 | |
| author | Shibby <shibby@openlinksys.info> | |
| Sat, 27 Apr 2013 09:50:30 +0000 (27 11:50 +0200) | ||
| committer | Shibby <shibby@openlinksys.info> | |
| Sat, 27 Apr 2013 09:50:30 +0000 (27 11:50 +0200) | ||
| tree | 892b2f94d68571eb4205271ca23443421727f4e1 | tree |
| parent | 69e8b10e7c1421643d9bac43f4eb93c5665e19f6 | commitdiff |
| parent | 11a24361a4881ddb032d17e1882b2a6d83430481 | commitdiff |
Merge branch 'tomato-shibby' into tomato-shibby-RT-N
Conflicts:
release/src-rt/linux/linux-2.6/config_base
release/src-rt/linux/linux-2.6/net/ipv4/netfilter/Kconfig
release/src-rt/linux/linux-2.6/net/ipv4/netfilter/Makefile
release/src/router/dnsmasq/CHANGELOG
release/src/router/dnsmasq/VERSION
release/src/router/dnsmasq/man/dnsmasq.8
release/src/router/dnsmasq/po/fr.po
release/src/router/dnsmasq/po/pl.po
release/src/router/dnsmasq/src/dhcp6.c
release/src/router/dnsmasq/src/ipset.c
release/src/router/dnsmasq/src/lease.c
release/src/router/dnsmasq/src/option.c
release/src/router/dnsmasq/src/rfc3315.c
Conflicts:
release/src-rt/linux/linux-2.6/config_base
release/src-rt/linux/linux-2.6/net/ipv4/netfilter/Kconfig
release/src-rt/linux/linux-2.6/net/ipv4/netfilter/Makefile
release/src/router/dnsmasq/CHANGELOG
release/src/router/dnsmasq/VERSION
release/src/router/dnsmasq/man/dnsmasq.8
release/src/router/dnsmasq/po/fr.po
release/src/router/dnsmasq/po/pl.po
release/src/router/dnsmasq/src/dhcp6.c
release/src/router/dnsmasq/src/ipset.c
release/src/router/dnsmasq/src/lease.c
release/src/router/dnsmasq/src/option.c
release/src/router/dnsmasq/src/rfc3315.c
16 files changed: