Linux 3.0.49

Conflicts:

	kernel/sys.c