Linux 3.4.93

Conflicts:
	drivers/tty/tty_buffer.c
	include/linux/highmem.h
	kernel/events/core.c