Linux 3.4.94

Conflicts:
	drivers/staging/zram/zram_sysfs.c

Conflicts:
	drivers/staging/zram/zram_sysfs.c