Merge commit 'fixes.2015.02.23a' into core/rcu