Merge branch 'reg-cache' into for-2.6.32