Linux 3.4.24

Conflicts:
	Makefile
	arch/arm/include/asm/vfpmacros.h
	drivers/usb/serial/option.c