Merge tag 'v3.4.99'

This is the 3.4.99 stable release

Conflicts:

	drivers/crypto/msm/qcrypto.c

Signed-off-by: xperiafan13@shockGensMOD <mundorap2010@gmail.com>

Conflicts:
	Makefile
	arch/arm/boot/compressed/head.S
	drivers/tty/tty_io.c
	drivers/usb/serial/option.c
	kernel/futex.c