fix conflict with previous versions
Merge branch 'ev3dev-jessie' of github.com:ev3dev/rtl8192cu-fixes into ev3dev-jessie