diff options
| author | Nicolas Thill <nico@openwrt.org> | 2015-04-02 14:53:19 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2015-04-02 14:53:19 +0000 |
| commit | 3bd422f61026ff49281380a8865889c2ad7b2e7b (patch) | |
| tree | 1962c04330e7ca5aa836848359aaee5d4e52c507 /package/network | |
| parent | 1fe3836fbc598ca03fa199439c3e66d6b45f6b64 (diff) | |
| download | upstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.tar.gz upstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.tar.bz2 upstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.zip | |
kernel/modules: remove merge conflicts leftovers
Signed-off-by: Nicolas Thill <nico@openwrt.org>
SVN-Revision: 45243
Diffstat (limited to 'package/network')
0 files changed, 0 insertions, 0 deletions