Linux 3.4.47

Conflicts:
	Makefile