kernel/cgroup.c: fixed build

Change-Id: I9df755ceb53398f7b0b77e1028ad7980a843a376
Merge branch 'cm-10.1-linaro' of https://github.com/UltimatumKang/android_kernel_htc_msm8960-3.4 into cm-10.1-linaro

Conflicts:
	kernel/cgroup.c

Change-Id: I624a0619859468f1e05e5aa1f176e43b7fdd829b
Merge pull request #2 from UltimatumKang/cm-10.1-linaro

update