kernel/modules: remove merge conflicts leftovers
authorNicolas Thill <nico@openwrt.org>
Thu, 2 Apr 2015 14:53:19 +0000 (14:53 +0000)
committerNicolas Thill <nico@openwrt.org>
Thu, 2 Apr 2015 14:53:19 +0000 (14:53 +0000)
commit3bd422f61026ff49281380a8865889c2ad7b2e7b
tree1962c04330e7ca5aa836848359aaee5d4e52c507
parent1fe3836fbc598ca03fa199439c3e66d6b45f6b64
kernel/modules: remove merge conflicts leftovers

Signed-off-by: Nicolas Thill <nico@openwrt.org>
SVN-Revision: 45243
package/kernel/linux/modules/usb.mk