Linux 3.4.48

Conflicts:
	Makefile