tree 75c9b00c2a7e92cc8987bc53134379fe34e6da20
parent b107d80f466569663f2a0696f0003d9677f5bd6e
parent 5cff48266623322fd9aa939a7fe2b755f2db0c6c
author Linux Build Service Account <lnxbuild@localhost> 1488950899 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> 1488950898 -0800

Merge "[qca-ssdk]: Don't disable conntrack timer when do hw offload"