diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 21:24:19 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 21:24:19 +0300 |
commit | 9198407e23ec89f0e1562f439771aeea83345d0d (patch) | |
tree | c6a53b71b48c49d7713539eb035e7b2fcec69d2a /security/selinux | |
parent | d872694bac212f76ca13fd20a85e5c1bdb53a945 (diff) | |
parent | c775697b713b70293507573355aa8c8c177db35b (diff) | |
download | linux-9198407e23ec89f0e1562f439771aeea83345d0d.tar.xz |
Merge branch 'pci/resource' into next
* pci/resource:
microblaze/PCI: Remove pcibios_setup_bus_{self/devices} dead code
ARC: Remove empty kernel/pcibios.c
PCI: Add a generic weak pcibios_align_resource()
PCI: Add a generic weak pcibios_fixup_bus()
Diffstat (limited to 'security/selinux')
0 files changed, 0 insertions, 0 deletions