diff options
| author | Jens Axboe <axboe@fb.com> | 2015-02-20 22:12:02 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-02-20 22:12:02 -0800 |
| commit | decf6d79de84e427d409ff74156af2e77ffadd84 (patch) | |
| tree | 45801481c596ecd0b05c719025e29fa028aaceee /drivers/firewire/core-device.c | |
| parent | 045c47ca306acf30c740c285a77a4b4bda6be7c5 (diff) | |
| parent | 0c0f9b95c8b710b74772edd9693fe7ab5419a75a (diff) | |
Merge branch 'for-3.20' of git://git.infradead.org/users/kbusch/linux-nvme into for-linus
Merge 3.20 NVMe changes from Keith.
Diffstat (limited to 'drivers/firewire/core-device.c')
0 files changed, 0 insertions, 0 deletions