Linux 3.4.55

Conflicts:

	arch/sparc/kernel/asm-offsets.c
	arch/sparc/mm/hypersparc.S
	arch/sparc/mm/swift.S
	arch/sparc/mm/tlb.c
	arch/sparc/mm/tsunami.S
	arch/sparc/mm/viking.S
	drivers/usb/serial/option.c