Linux 3.0.77

Conflicts:
	drivers/video/console/fbcon.c