Rebase to Linux 3.0.61

Conflicts:
	Makefile