Linux 3.4.7

Conflicts:
	mm/vmscan.c