Linux 3.4.30-31

Conflicts:
	Makefile