Linux 3.4.7

Conflicts:

	Makefile