Squashed update of kernel from 3.4.68 to 3.4.69

Conflicts:
	Makefile
	drivers/gpu/drm/radeon/atombios_encoders.c
	drivers/usb/core/quirks.c
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/option.c