Linux 3.4.91

Conflicts:
	Makefile