Linux 3.4.54

Conflicts:

	drivers/usb/gadget/f_mass_storage.c