Linux 3.4.35

Conflicts:
	Makefile