Linux 3.4.78

Conflicts:
	Makefile