[ndiswrapper-kmod/el7] Fix merge