Linux 3.4.83

Conflicts:
	Makefile

Change-Id: I3743553ad5d86951a133aaf4fca3793739e0e427
Signed-off-by: houst0nn <houstonn@gmail.com>