Linux 3.4.93

Conflicts:
	Makefile

Conflicts:
	Makefile
Change-Id: I967e3bb07b239941ea51af6b09d61d7b08138f46