diff options
| author | Jens Axboe <axboe@fb.com> | 2014-05-28 10:18:51 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-05-28 10:18:51 -0600 |
| commit | 0fb662e2250afdf2c54253dbf2063dc9d8369b69 (patch) | |
| tree | 6a1014ab27531dae2702894e9e3cb6cdad9f0d60 /drivers/cdrom/cdrom.c | |
| parent | 6178976500ae61fa7b12ebb2d3de816dc9396388 (diff) | |
| parent | cdef54dd85ad66e77262ea57796a3e81683dd5d6 (diff) | |
| download | talos-obmc-linux-0fb662e2250afdf2c54253dbf2063dc9d8369b69.tar.gz talos-obmc-linux-0fb662e2250afdf2c54253dbf2063dc9d8369b69.zip | |
Merge branch 'for-3.16/core' into for-3.16/drivers
Pull in core changes (again), since we got rid of the alloc/free
hctx mq_ops hooks and mtip32xx then needed updating again.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/cdrom/cdrom.c')
0 files changed, 0 insertions, 0 deletions
