Linux 3.4.64

Conflicts:
	Makefile