Linux 3.14-rc7

Conflicts:
	Makefile