Linux 3.0.60

Conflicts:

	Makefile