Linux 3.4.83

Conflicts:
	Makefile