Linux 3.4.6

Conflicts:
	Makefile