Merge 3.0.68

Conflicts:
	kernel/cgroup.c

Change-Id: Ibae53bbb0eafbf4d273fce805eddce3db9ca48f9
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	kernel/cgroup.c