Linux 3.4.52

Conflicts:
	Makefile

Change-Id: I286c9e0b33b77522da8f5934951db87f77f87d75