Linux 3.0.54

Conflicts:

	Makefile