Merge commit 'v2.6.28-rc3' into tracing/ftrace