zram: sync with kernel.org @ 5fa5a90116be97cd15deac3f45b602c2e5c5fb58

Signed-off-by: Paul Reioux <reioux@gmail.com>

Conflicts:
	drivers/staging/zram/zram_drv.c