diff options
| author | Bjorn Helgaas | 2016-08-01 12:34:01 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2016-08-01 12:34:01 -0500 |
| commit | 9454c23852ca6d7aec89fd6fd46a046c323caac3 (patch) | |
| tree | 794be65345027b5adea3720a43124fee338333a5 /fs/btrfs/sysfs.h | |
| parent | a04bee8285a71cdbb9076c3dc38be1f0b9a6b4b3 (diff) | |
| parent | 4ef33685aa0957d771e068b60a5f3ca6b47ade1c (diff) | |
Merge branch 'pci/msi-affinity' into next
Conflicts:
drivers/nvme/host/pci.c
Diffstat (limited to 'fs/btrfs/sysfs.h')
0 files changed, 0 insertions, 0 deletions