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)
commit13338c42ad55e0153d02a8543a2efe440375ef71
tree6c9b3fda43640a7cfc6750e1cd0d1168f92ff17a
parent0992961460e5d4310aa80474b5ae3b50b599144f
kernel/modules: remove merge conflicts leftovers

Signed-off-by: Nicolas Thill <nico@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45243 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/kernel/linux/modules/usb.mk