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
..
2015-04-02 14:31:02 +00:00
2014-07-01 10:26:03 +00:00
2014-08-27 08:49:55 +00:00
2015-01-17 13:58:09 +00:00