Linux 3.0.70

Conflicts:

	Makefile