Linux 3.4.86

Conflicts:
	Makefile