Linux 3.0.60 (Thanks task!)

Conflicts:

	Makefile