Linux 3.0.48

Conflicts:

	Makefile