diff options
| author | Jens Axboe <axboe@fb.com> | 2017-01-26 09:56:15 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-26 09:56:15 -0700 |
| commit | 0d4ee015d5ea50febb882d00520d62c6de3f725c (patch) | |
| tree | 6bd2e032e00c34590a8d39d5a43b6a7518d1384d /include/dt-bindings/clock/lpc18xx-ccu.h | |
| parent | 690e5325b8c7d5db05fc569c0f7b888bb4248272 (diff) | |
| parent | 19e420bb4076ace670addc55300e3b8c4a02dfc6 (diff) | |
Merge branch 'nvme-4.10-fixes' of git://git.infradead.org/nvme into for-linus
Pull nvme target fixes from Sagi:
Given that its -rc6, I removed anything that is not
bug fix.
- nvmet-fc discard fix from Christoph
- queue disconnect fix from James
- nvmet-rdma dma sync fix from Parav
- Some more nvmet fixes
Diffstat (limited to 'include/dt-bindings/clock/lpc18xx-ccu.h')