Linux 3.4.68

Conflicts:
	Makefile