Merge tag 'v3.0.68' into android-3.0

This is the 3.0.68 stable release

Conflicts:
	kernel/cgroup.c

Change-Id: I067982d25e18e3a12de93a5eb6429b8829d7ca11
Merge branch 'android-3.0' of https://android.googlesource.com/kernel/common into jb_mr1.1_exp