zram: last time

Conflicts:

	drivers/staging/zram/zram_drv.c