Patch 3.0.57 Main Stream.

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