Linux 3.4.5

Conflicts:
	Makefile