3.0.36

Conflicts:

	Makefile
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/option.c