Linux 3.4.35

Conflicts:
	Makefile
Fix up some mis-merges from Linux merge