Linux 3.4.74

Conflicts:
	arch/um/os-Linux/start_up.c
	drivers/input/keyboard/Kconfig