Linux 3.4.60

Conflicts:

	Makefile