Linux 3.4.1

Conflicts:
	Makefile
Linux 3.4.2

Conflicts:
	Makefile