Linux 3.0.45

Conflicts:

	Makefile