| commit | b207892b061da7608878e273ae22ba9bf9be264b | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@fb.com> | Thu Sep 11 09:31:18 2014 -0600 |
| committer | Jens Axboe <axboe@fb.com> | Thu Sep 11 09:31:18 2014 -0600 |
| tree | 51daa46b89b83cad422941f52110b19571b85b79 | |
| parent | 018a17bdc8658ad448497c84d4ba21b6985820ec [diff] | |
| parent | a516440542afcb9647f88d12c35640baf02d07ea [diff] |
Merge branch 'for-linus' into for-3.18/core A bit of churn on the for-linus side that would be nice to have in the core bits for 3.18, so pull it in to catch us up and make forward progress easier. Signed-off-by: Jens Axboe <axboe@fb.com> Conflicts: block/scsi_ioctl.c