Linux 3.4.85

Conflicts:
	Makefile