Linux 3.0.101

Conflicts:
	Makefile
	drivers/video/fbmem.c