Linux 3.4.57

Conflicts:
	Makefile