Linux 3.4.58

Conflicts:
	Makefile