Linux 3.1-rc1

Conflicts:
	Makefile