Merge remote-tracking branch 'linus/master' into merge-example-rcu2

Example whitespace merge commit for RCU.