kernel/modules: remove merge conflicts leftovers
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 2 Apr 2015 14:53:19 +0000 (14:53 +0000)
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 2 Apr 2015 14:53:19 +0000 (14:53 +0000)
commit361f14722619143e94edb513f156bfe9c7de7e9d
tree6c9b3fda43640a7cfc6750e1cd0d1168f92ff17a
parent6bc130e82dc2154ebd9bb91c810424ec564ad967
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