summaryrefslogtreecommitdiff
path: root/fs/nilfs2/alloc.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-06-11 14:38:25 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-06-11 14:38:25 -0600
commit38a6148248e199a4a960bbaa6b8eb14f138b73e1 (patch)
treec4bbb14bdddc74b34b8a2a787f0f311b5f08d9a8 /fs/nilfs2/alloc.h
parent843a85ced99b9c8f8221f11d5cbcc56c2dae2842 (diff)
parentb701c0b1fe819a2083fc6ec5332e0e4492b9516d (diff)
parentc2e0fb966ad8ab3c41eb6fbf0239d06f287a2505 (diff)
parent227f06470502c4fea3d93df1f12a77e3e37f6263 (diff)
Merge branches 'pci/msi', 'pci/iommu' and 'pci/cleanup' into next
* pci/msi: PCI/MSI: Fix memory leak in free_msi_irqs() * pci/iommu: PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L PCI: Add bridge DMA alias quirk for ITE bridge * pci/cleanup: PCI: Merge multi-line quoted strings PCI: Whitespace cleanup PCI: Move EXPORT_SYMBOL so it immediately follows function/variable