Linux 3.4.99
Signed-off-by: Jean Francis Dominique S. Mabalot <jmabalot@google.com>

Conflicts:
	Makefile
Merge

Signed-off-by: Jean Francis Dominique S. Mabalot <jmabalot@google.com>