Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing