Linux 3.10.6

Conflicts:
	drivers/staging/zram/zram_drv.c