Linux 3.0.79

Conflicts:
	Makefile