Upstream updates from franco.Kernel by Francisco Franco

Conflicts:
	mm/page-writeback.c