Linux 3.4.71

Conflicts:
	fs/proc/stat.c