GCC 4.7 fixes

Conflicts:

	kernel/cgroup.c