tree 37f2b32b1330f51dbe10ccf4300114c72f7aabdc
parent 8586ea96b4f919a9b38929040bc9ce57c9998fc4
parent 0fec08b4ecfc36fd8a64432343b2964fb86d2675
author Jens Axboe <axboe@kernel.dk> 1389198765 -0700
committer Jens Axboe <axboe@kernel.dk> 1389198765 -0700

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

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