Merge branch 'this_cpu_ops' into for-2.6.38