Merge branch 'for-3.14/core' into for-3.14/drivers
authorJens Axboe <axboe@kernel.dk>
Wed, 8 Jan 2014 16:32:45 +0000 (09:32 -0700)
committerJens Axboe <axboe@kernel.dk>
Wed, 8 Jan 2014 16:32:45 +0000 (09:32 -0700)
commit54a387cb9e600256e50cb9e2209e7e4f06f464de
tree37f2b32b1330f51dbe10ccf4300114c72f7aabdc
parent8586ea96b4f919a9b38929040bc9ce57c9998fc4
parent0fec08b4ecfc36fd8a64432343b2964fb86d2675
Merge branch 'for-3.14/core' into for-3.14/drivers

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