Linux 3.4.36

Conflicts:
	Makefile