Linux 3.4.52

Conflicts:
	Makefile