Linux 3.0.40

Conflicts:

	Makefile