Linux 3.0.36

Conflicts:

	Makefile
Modified Makefile