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

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