3.0.68: Merge remote-tracking branch 'remotes/linux/linux-3.0.y' into mr1-linux

Conflicts:
	kernel/cgroup.c