zram_drv: sync with kernel.org

sync point @ 8f5f90a872c38b4e78f3cc95e8a25434b98e4db2

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

Conflicts:
	drivers/staging/zram/zram_drv.c

Conflicts:
	drivers/staging/zram/zram_drv.c