Fix 3.4.87 merge

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Fix again

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	drivers/usb/core/driver.c
Merge branch 'Deathly-4.4-Test' of https://github.com/LiquidSmooth/android_kernel_samsung_d2 into Deathly-4.4-Test

Conflicts:
	drivers/usb/core/driver.c