Linux 3.4.65

Conflicts:
	Makefile