Merge commit 'v2.6.34-rc7' into perf/nmi