PATCH: merge Linux 3.0.68 into local branch cm10