Merge tag 'v3.4.94' into cm-11.0

This is the 3.4.94 stable release

Conflicts:
	drivers/staging/zram/zram_drv.c
	drivers/staging/zram/zram_sysfs.c
	drivers/tty/tty_buffer.c
	include/linux/highmem.h
	kernel/events/core.c
	net/bluetooth/l2cap_core.c

Change-Id: Idb08405b6d82079f643a52e49e455737bfefd016