Linux 3.4.51

Conflicts:
	Makefile