Merge branch 'for-3.14/core' into for-3.14/drivers

We need the updated code to make bcache easier to merge.