Linux 3.4.92

Conflicts:
	drivers/md/dm-mpath.c
	drivers/staging/zram/zram_drv.c
	drivers/staging/zram/zram_sysfs.c
	kernel/futex.c

Conflicts:
	kernel/futex.c