diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-07 15:02:04 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-07 15:02:04 -0700 |
| commit | eaaeb1cb33310dea6c3fa45d8bfc63e5a1d0a846 (patch) | |
| tree | a76b60ff193a29b521e1bd63943a6d1969fe9af4 /drivers/mtd/nand/tmio_nand.c | |
| parent | c245f2422031fec447e4d9e35fb0ef0fd5e42ab9 (diff) | |
| parent | 79272138bd5c35edb9be5ae7b473a2741751a706 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Enable upstream bridges even for VFs on virtual buses
PCI: Add pci_upstream_bridge()
PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()
Diffstat (limited to 'drivers/mtd/nand/tmio_nand.c')
0 files changed, 0 insertions, 0 deletions