Linux 3.4.100

Conflicts:
	mm/shmem.c