Linux 3.4.10

Conflicts:
	Makefile