Merge branch 'delayed-logging-for-2.6.35' into for-linus