Linux 3.4.19

Conflicts:

	Makefile