init:usb: fixup deprecated variables
Merge branch 'jellybean-3.0' of git://github.com/dhiru1602/android_device_samsung_galaxysl into cm-10.1