Linux 3.4.56

Conflicts:

	Makefile