Linux 3.4.70

Conflicts:
	Makefile