Nicolas Thill 3bd422f610 kernel/modules: remove merge conflicts leftovers ...

Signed-off-by: Nicolas Thill <nico@openwrt.org>

SVN-Revision: 45243

2015-04-02 14:53:19 +00:00

..

modules

kernel/modules: remove merge conflicts leftovers

2015-04-02 14:53:19 +00:00

Makefile

kernel: add netfilter.mk to modules makefile SCAN_DEPS

2014-12-09 12:35:18 +00:00